diff --git a/longs/migrations/0048_auto_20210911_1806.py b/longs/migrations/0048_auto_20210911_1806.py
new file mode 100644
index 00000000..9d3017c4
--- /dev/null
+++ b/longs/migrations/0048_auto_20210911_1806.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.6 on 2021-09-11 17:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0047_auto_20210911_1759'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ciduseranswer',
+            name='primary_mark',
+        ),
+        migrations.RemoveField(
+            model_name='ciduseranswer',
+            name='secondary_mark',
+        ),
+        migrations.AddField(
+            model_name='ciduseranswer',
+            name='mark',
+            field=models.ManyToManyField(blank=True, null=True, related_name='user_answer', to='longs.AnswerMarks'),
+        ),
+    ]
diff --git a/longs/migrations/0049_alter_ciduseranswer_mark.py b/longs/migrations/0049_alter_ciduseranswer_mark.py
new file mode 100644
index 00000000..8ca44e42
--- /dev/null
+++ b/longs/migrations/0049_alter_ciduseranswer_mark.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.6 on 2021-09-11 17:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0048_auto_20210911_1806'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ciduseranswer',
+            name='mark',
+            field=models.ManyToManyField(blank=True, related_name='user_answer', to='longs.AnswerMarks'),
+        ),
+    ]
diff --git a/longs/models.py b/longs/models.py
index 0f335a36..016bc01b 100644
--- a/longs/models.py
+++ b/longs/models.py
@@ -727,12 +727,12 @@ class CidUserAnswer(models.Model):
         max_length=3, choices=ScoreOptions.choices, default=ScoreOptions.UNMARKED, blank=True, help_text="The final score for the candidate"
     )
 
-    primary_mark = models.ForeignKey(
-        "AnswerMarks", related_name="primary_mark", on_delete=models.SET_NULL, null=True, blank=True
-    )
-    secondary_mark = models.ForeignKey(
-        "AnswerMarks", related_name="secondary_mark", on_delete=models.SET_NULL, null=True, blank=True
+    mark = models.ManyToManyField(
+        "AnswerMarks", related_name="user_answer", blank=True
     )
+    #secondary_mark = models.ForeignKey(
+    #    "AnswerMarks", related_name="user_answer", on_delete=models.SET_NULL, null=True, blank=True
+    #)
 
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
diff --git a/rad/settings.py b/rad/settings.py
index 0f6e0209..98844843 100644
--- a/rad/settings.py
+++ b/rad/settings.py
@@ -239,6 +239,7 @@ TINYMCE_DEFAULT_CONFIG = {
     "content_css": 'dark',
 }
 
+DEFAULT_AUTO_FIELD='django.db.models.AutoField'
 
 try:
     from .settings_local import *