diff --git a/longs/models.py b/longs/models.py
index dc301f34..6f7fbf05 100644
--- a/longs/models.py
+++ b/longs/models.py
@@ -553,7 +553,7 @@ class Exam(ExamBase):
         return exam_question
 
 
-    def get_exam_json(self):
+    def get_exam_json(self, based=False):
         questions = self.exam_questions.all()
 
         exam_questions = defaultdict(dict)
@@ -562,38 +562,38 @@ class Exam(ExamBase):
 
         n = 1
         for q in questions:
-            exam_order.append(q.id)
+            if based:
+                exam_order.append(q.id)
 
-            exam_questions[q.id] = q.json_creation_time.isoformat()
+                exam_questions[q.id] = q.json_creation_time.isoformat()
 
-            continue
-
-            # Loop through longimage associations
-            images = []
-            image_titles = []
-            for series in q.series.all():
-                #image_array = []
-                #for i in series.images.all():
-                #    image_array.append(image_as_base64(i.image))
-                #    #image_array.append(i.image.url)
-                image_array = [image_as_base64(i.image) for i in series.images.all()]
-                images.append(image_array)
-                image_titles.append(series.get_examination())
+            else:
+                # TODO: combine with question_json
+                images = []
+                image_titles = []
+                for series in q.series.all():
+                    #image_array = []
+                    #for i in series.images.all():
+                    #    image_array.append(image_as_base64(i.image))
+                    #    #image_array.append(i.image.url)
+                    image_array = [i.image.url for i in series.images.all()]
+                    images.append(image_array)
+                    image_titles.append(series.get_examination())
 
 
-            #exam_questions[q.id] = n
+                #exam_questions[q.id] = n
 
-            exam_questions[q.id] = {
-                "title": q.history,
-                "images": images,
-                "image_titles": image_titles,
-                #"feedback_image": [],
-                #"annotations": [str(q.image_annotations)],
-                "type": "long",
-            }
+                exam_questions[q.id] = {
+                    "title": q.history,
+                    "images": images,
+                    "image_titles": image_titles,
+                    #"feedback_image": [],
+                    #"annotations": [str(q.image_annotations)],
+                    "type": "long",
+                }
 
-            #if feedback_images:
-            #    exam_questions[q.id]["feedback_image"] = feedback_images
+                #if feedback_images:
+                #    exam_questions[q.id]["feedback_image"] = feedback_images
 
 
         exam_json = {