diff --git a/Controllers/RecipeController.php b/Controllers/RecipeController.php
index a189710..98525c8 100644
--- a/Controllers/RecipeController.php
+++ b/Controllers/RecipeController.php
@@ -10,14 +10,15 @@ final class RecipeController
         }
 
         //TODO MAKE THE VIEW USE THE NEW DATA FORMAT
-        $A_returnArray = RecipeModel::getFullRecipeWithApprs($A_urlParams[0]);
-        if ($A_returnArray === null) {
+        $O_recipe = RecipeModel::getFullRecipeWithApprs($A_urlParams[0]);
+        if ($O_recipe === null) {
             throw new HTTPSpecialCaseException(404);
         }
 
-        $A_returnArray["ADMIN"] = Session::is_admin();
-
-        View::show("recipe/view", $A_returnArray);
+        View::show("recipe/view", array(
+            "ADMIN" => Session::is_admin(),
+            "RECIPE" => $O_recipe
+        ));
     }
 
     public function editAction(Array $A_urlParams = null, Array $A_postParams = null)
diff --git a/Models/RecipeModel.php b/Models/RecipeModel.php
index 5eaa87a..afcef50 100644
--- a/Models/RecipeModel.php
+++ b/Models/RecipeModel.php
@@ -6,7 +6,7 @@ final class RecipeModel
     public $S_NAME = null;
     public $I_TIME = null;
     public $I_COST = null;
-    public $S_DESCR = null;
+    public $S_DESC = null;
     public $S_RECIPE = null;
     public $I_DIFFICULTY_ID = null;
     public $I_AUTHOR_ID = null;
@@ -16,12 +16,12 @@ final class RecipeModel
     public $A_APPRS = null;
     public $A_INGREDIENTS = null;
     
-    public function __construct($S_NAME, $I_TIME, $I_COST, $S_DESCR, $S_RECIPE, $I_DIFFICULTY_ID, $I_AUTHOR_ID)
+    public function __construct($S_NAME, $I_TIME, $I_COST, $S_DESC, $S_RECIPE, $I_DIFFICULTY_ID, $I_AUTHOR_ID)
     {
         $this->S_NAME = $S_NAME;
         $this->I_TIME = $I_TIME;
         $this->I_COST = $I_COST;
-        $this->S_DESCR = $S_DESCR;
+        $this->S_DESC = $S_DESC;
         $this->S_RECIPE = $S_RECIPE;
         $this->I_DIFFICULTY_ID = $I_DIFFICULTY_ID;
         $this->I_AUTHOR_ID = $I_AUTHOR_ID;        
@@ -34,7 +34,7 @@ final class RecipeModel
         $stmt->bindParam("name", $this->S_NAME);
         $stmt->bindParam("time", $this->I_TIME);
         $stmt->bindParam("cost", $this->I_COST);
-        $stmt->bindParam("desc", $this->S_DESCR);
+        $stmt->bindParam("desc", $this->S_DESC);
         $stmt->bindParam("recipe", $this->S_RECIPE);
         $stmt->bindParam("difficulty_id", $this->I_DIFFICULTY_ID);
         $stmt->bindParam("author_id", $this->I_AUTHOR_ID);
@@ -49,7 +49,7 @@ final class RecipeModel
         $stmt->bindParam("name", $this->S_NAME);
         $stmt->bindParam("time", $this->I_TIME);
         $stmt->bindParam("cost", $this->I_COST);
-        $stmt->bindParam("desc", $this->S_DESCR);
+        $stmt->bindParam("desc", $this->S_DESC);
         $stmt->bindParam("recipe", $this->S_RECIPE);
         $stmt->bindParam("difficulty_id", $this->I_DIFFICULTY_ID);
         $stmt->bindParam("author_id", $this->I_AUTHOR_ID);
@@ -62,6 +62,12 @@ final class RecipeModel
         $stmt->execute();
     }
 
+    private static function createFromRow($A_row, $I_ID){
+        $O_recipe = new RecipeModel($A_row["NAME"], $A_row["TIME"], $A_row["COST"], $A_row["DESC"], $A_row["RECIPE"], $A_row["DIFFICULTY_ID"], $A_row["AUTHOR_ID"]);
+        $O_recipe->I_ID = $I_ID;
+        return $O_recipe;
+    }
+
     public static function getRecipeByID($I_id)
     {
         $O_model = Model::get();
@@ -72,10 +78,15 @@ final class RecipeModel
         $row = $stmt->fetch();
         if ($row === false) return null;
 
-        $O_recipe = new RecipeModel($row["NAME"], $row["TIME"], $row["COST"], $row["DESCR"], $row["RECIPE"], $row["DIFFICULTY_ID"], $row["AUTHOR_ID"]);
+        return self::createFromRow($row, $I_id);
+    }
 
-        $O_recipe->I_ID = $I_id;
-        return $O_recipe;
+    public function getImageLink(){
+        return '/static/img/recipes/'.$this->I_ID;
+    }
+
+    public function getLink(){
+        return '/recipe/view/'.$this->I_ID;
     }
 
     public function getImage(){
@@ -159,9 +170,7 @@ final class RecipeModel
         )
 
         -- get a row per occurrence and sort by occurrences number
-        select RECIPE.ID, RECIPE.NAME,
-        CONCAT('/recipe/view/', RECIPE.ID) AS RECIPE_LINK,
-        CONCAT('/static/img/recipes/', RECIPE.ID) AS IMG_LINK,
+        select RECIPE.*
         1 AS NOTE
         from CTE
                 JOIN RECIPE
@@ -174,7 +183,12 @@ final class RecipeModel
 
         $stmt->bindParam("query", $S_query);
         $stmt->execute();
+        
+        $A_recipes = array();
+        foreach($stmt->fetchAll() as $row){
+            array_push($A_recipes, self::createFromRow($row, $row["ID"]));
+        }
 
-        return $stmt->fetchAll();
+        return $A_recipes;
     }
 }
diff --git a/Views/recipe/view.php b/Views/recipe/view.php
index 53ea68b..9db27ce 100644
--- a/Views/recipe/view.php
+++ b/Views/recipe/view.php
@@ -1,23 +1,26 @@
-
+<?php
+$O_recipe = $A_view["RECIPE"];
+?>
 <main>
     <?php View::show("common/category_list") ?>
     <article>
-        <img src="<?= $A_view["IMG_LINK"] ?>" alt="Image d'illustration de la recette">
+        <img src="<?= $O_recipe->getImageLink() ?>" alt="Image d'illustration de la recette">
 
         <section class="infosRecette">
             <header>
-                <h1><?= $A_view["NAME"] ?></h1>
-                <p><?= $A_view["TIME"] ?>&nbsp;—&nbsp;<?= $A_view["DIFFICULTY_NAME"] ?></p>
+                <h1><?= $O_recipe->S_NAME ?></h1>
+                <p><?= $O_recipe->I_TIME ?>&nbsp;—&nbsp;<?= $O_recipe->O_DIFFICULTY->S_NAME ?></p>
             </header>
-            <p><?= $A_view["DESC"] ?></p>
+            <p><?= $O_recipe->S_DESC ?></p>
         </section>
 
         <section class="ingredientsRecette">
             <h2>Ingrédients</h2>
             <ul>
                 <?php
-                    foreach($A_view["INGREDIENTS"] as $ingredient)
-                        echo "<li> {$ingredient["NAME"]}: {$ingredient["QUANTITY"]} </li>";
+                    foreach($O_recipe->getIngredients() as $O_ingredient){
+                        echo "<li> $O_ingredient->S_NAME: $O_ingredient->I_QUANTITY </li>";
+                    }
                 ?>
             </ul>
         </section>
@@ -26,13 +29,13 @@
             <h2>Préparation</h2>
             <ol>
                 <?php
-                    foreach(explode("\n", $A_view["RECIPE"]) as $instructions)
-                        echo "<li>".$instructions."</li>";
+                    foreach(explode("\n", $O_recipe->S_RECIPE) as $S_instr)
+                        echo "<li>".$S_instr."</li>";
                 ?>
             </ol>
         </section>
 
-        <p>By <?= $A_view["AUTHOR_USERNAME"] ?></p>
+        <p>By <?= $O_recipe->getAuthor()->S_USERNAME ?></p>
 
         <?php
             View::show("appreciations/view_all", $A_view)