diff --git a/~dev_rating/application/classes/Controller/Admin/Accounts.php b/~dev_rating/application/classes/Controller/Admin/Accounts.php
index 04197f416e10aacf203341e50ff836fc5eca7046..84d529a834a011b7c9b17d290119f2d629fc2c3a 100644
--- a/~dev_rating/application/classes/Controller/Admin/Accounts.php
+++ b/~dev_rating/application/classes/Controller/Admin/Accounts.php
@@ -16,29 +16,9 @@ class Controller_Admin_Accounts extends Controller_UserEnvi {
         Cookie::set('fD', 'true');
         $twig = Twig::factory('admin/accounts/codes');
         $twig->Faculties = Model_Faculties::create()->common()->asArray();
-        $twig->Grades = $this->getGrades();
+        $twig->Grades = Model_Grades::create()->structured()->asArray();
         $twig->User = $this->UserInfo;
         $this->response->body($twig);
-    }    
-    
-      
-    public function getGrades() {
-        $grades = Model_Grades::create()->common()->asArray();
-        $gradesHandled = array(); $i = $j = 0; $degree = 'null';
-
-        foreach($grades as $row)
-        {
-            if($degree != $row['Degree'])
-            {
-                $degree = $row['Degree'] ;
-                $i++; $j = 0;
-            }
-            $j++;
-            $gradesHandled[$i]['Title'] = Model_Grades::getDegreeTitle($row['Degree']);
-            $gradesHandled[$i]['Grades'][$j]['ID'] = $row['ID'];
-            $gradesHandled[$i]['Grades'][$j]['Num'] = $row['Num'];
-        }
-        return $gradesHandled;
-    } # todo: duplicating code, see Model_Grades
+    }
 }
             
\ No newline at end of file