diff --git a/rapids/forms.py b/rapids/forms.py
index 3d5f188b..01c7cb02 100755
--- a/rapids/forms.py
+++ b/rapids/forms.py
@@ -131,17 +131,16 @@ class RapidForm(ModelForm):
         instance = ModelForm.save(self, False)
         instance.save()
 
-        self.save_m2m()
-        #old_exams = instance.exams.all()
+        old_exams = instance.exams.all()
 
-        #new_exams = self.cleaned_data["exams"]
+        new_exams = self.cleaned_data["exams"]
 
-        #for exam in old_exams:
-        #    if exam in new_exams:
-        #        exam.exam_questions.add(instance)
-        #    else:
-        #        exam.exam_questions.remove(instance)
-        #    exam.save()
+        for exam in old_exams:
+            if exam in new_exams:
+                exam.exam_questions.add(instance)
+            else:
+                exam.exam_questions.remove(instance)
+            exam.save()
 
         #        # Prepare a 'save_m2m' method for the form,
         #        old_save_m2m = self.save_m2m
@@ -158,6 +157,7 @@ class RapidForm(ModelForm):
         #        # Do we need to save all changes now?
         #        # if commit:
         #        instance.save()
+        self.save_m2m()
 
         return instance
 
@@ -171,7 +171,6 @@ class RapidForm(ModelForm):
             "region",
             "laterality",
             "examination",
-            "exams",
             # "site",
             "feedback",
             "open_access",