diff --git a/routers/api/v1/picture/picture.go b/routers/api/v1/picture/picture.go
index e3a5a8a..07508e9 100644
--- a/routers/api/v1/picture/picture.go
+++ b/routers/api/v1/picture/picture.go
@@ -73,11 +73,21 @@ func Save(c *fiber.Ctx) error {
 func GetPictures(c *fiber.Ctx) error {
 	db := database.DB
 
-	log.Info("here")
+	pictures := []map[string]interface{}{}
 
-	pictures := &[]structs.Picture{}
-
-	db.Find(pictures)
+	db.Model(structs.Picture{}).Select("user_id", "picture_id", "likes", "description").Find(&pictures)
+
+	return c.JSON(pictures)
+}
+
+func GetPicturesByUserId(c *fiber.Ctx) error {
+	db := database.DB
+
+	log.Infoln("")
+
+	pictures := []structs.APIPicture{}
+
+	db.Model(structs.Picture{}).Where("user_id", c.Params("id")).Find(&pictures)
 
 	return c.JSON(pictures)
 }