                          moduleInfoExistent)))
 
         moduleInfoFinal
-        (get-module-info-from-url-hash-module-info moduleInfoExistent)]
+        (get-module-info-from-url-hash-module-info moduleInfoExistent)
+
+        moduleCodes
+        (distinct (map #(:moduleCode %1) moduleInfoFinal))]
 
     (.log js/console (str "moduleInfoExistent = " (.stringify js/JSON (clj->js moduleInfoExistent))))
     (.log js/console (str "moduleInfoFinal = " (.stringify js/JSON (clj->js moduleInfoFinal))))
+
+    (doseq [moduleCode moduleCodes]
+      (add-to-ModulesSelectedOrder! moduleCode)
+      (add-module-to-exam-timetable! moduleCode
+                                     (get moduleToColorsMap moduleCode)))
+
     ; Add the module lesson groups
     (doseq [modInfo moduleInfoFinal]
       (let [moduleCode      (:moduleCode modInfo)

                             moduleCode lessonType)}))
                  []
                  lessonTypes)]

      (doseq [moduleInfo newModInfoSeq]
        (add-module-lesson-group! (:moduleCode moduleInfo)

              (update-ModulesSelected-with-lesson-group! moduleCode lessonType
                                                         lessonGroup
                                                         lessonInfoSeq)

              ; Only lesson types with more than 1 option of lesson group
              ; will be draggable
