diff --git a/rapids/views.py b/rapids/views.py
index e50d3792..23d2a953 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -817,8 +817,20 @@ def exam_json(request, pk):
     for q in questions:
         exam_order.append(q.id)
 
+        # Loop through rapidimage associations
+        images = []
+        feedback_images = []
+        for i in q.images:
+            if i.feedback_image == True:
+                feedback_images.append(image_as_base64(i.image))
+            else:
+                images.append(image_as_base64(i.image))
+
+
+
         exam_questions[q.id] = {
-            "images": [image_as_base64(q.image)],
+            "images": [images],
+            "feedback_image": [feedback_images],
             "annotations": [str(q.image_annotations)],
             "type": "rapid",
         }