diff --git a/player.js b/player.js
index a805a61..f169dd7 100644
--- a/player.js
+++ b/player.js
@@ -115,7 +115,7 @@ function initializeAnimationView(submission, detailed) {
 function initializeModelAnswerView(submission) {
   const modelAnswer = submission.definitions.modelAnswer;
   if (modelAnswer.length > 0) {
-    var initialStateHTML = getModelAnswerInitialHTML(modelAnswer);
+    var initialStateHTML = submission.initialState.modelSvg;
   } else {
     $('#model-answer-container').html('<h3>No model answer data</h3>');
     return;
@@ -164,8 +164,8 @@ function getModelAnswerInitialHTML(modelAnswer) {
  * @returns a list of the modelAnswer steps with type click. 
  */
 function getModelAnswerSteps(modelAnswer) {
-  // modelAnswer.shift();
-  return modelAnswer.filter(step => step.type === 'click');
+  modelAnswer = modelAnswer.flat();
+  return modelAnswer.filter(step => step.gradable === true);
 }
 
 /**
diff --git a/testbench/OpenDSA/JSAV/build/JSAV-min.js b/testbench/OpenDSA/JSAV/build/JSAV-min.js
index 1b650d3..a428ad3 100644
--- a/testbench/OpenDSA/JSAV/build/JSAV-min.js
+++ b/testbench/OpenDSA/JSAV/build/JSAV-min.js
@@ -482,7 +482,8 @@
       var eventData = {
         "type": action,
         "currentStep": that.currentStep(),
-        "totalSteps": that.totalSteps()
+        "totalSteps": that.totalSteps(), 
+        "gradable": that._undo[that._undo.length - 1].options.grade ?? false,
       };
       that.logEvent(eventData);
     }