diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index eaa5b058292c1c23c7e0c0cb225600026a1e45c0..5d85c3ceda1fbbf509889e8b80cc236244438398 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -22,7 +22,7 @@ const SubmitButton = styled.button`
   top: 16px;
 `;
 
-const t = `<p class="paragraph"></p><div id="84db3734-94ed-4dd0-82bb-15404854df0f" class="multiple-choice"><div class="multiple-choice-question" id="38de8538-647a-489d-8474-f92d0d256c32"><p class="paragraph">question</p></div><div class="multiple-choice-option" id="debb868e-bbfe-4ba2-bf93-c963153ff791" correct="false" feedback="feedback 1"><p class="paragraph">answer 1</p></div><div class="multiple-choice-option" id="810bcf10-4fcb-4d1e-9dab-ce35cbd28527" correct="true" feedback="feedback 2"><p class="paragraph">answer 2</p></div></div>`;
+const t = `<p class="paragraph"></p><div id="" class="multiple-choice"><div class="multiple-choice-question" id="38de8538-647a-489d-8474-f92d0d256c32"><p class="paragraph">question </p></div><div class="multiple-choice-option" id="debb868e-bbfe-4ba2-bf93-c963153ff791" correct="false" correctanswer="false" feedback="feedback 1"><p class="paragraph">answer 1</p></div><div class="multiple-choice-option" id="810bcf10-4fcb-4d1e-9dab-ce35cbd28527" correct="true" correctanswer="false" feedback="feedback 2"><p class="paragraph">answer 2</p></div></div>`;
 
 const Hhmi = () => {
   const [submited, isSubmited] = useState(false);
@@ -39,9 +39,9 @@ const Hhmi = () => {
         customValues={{ showFeedBack: submited }}
         fileUpload={file => renderImage(file)}
         value={t}
-        readonly
+        // readonly
         layout={HhmiLayout}
-        // onChange={source => console.log(source)}
+        onChange={source => console.log(source)}
       />
     </>
   );
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
index 719d7e99452cc759919b6efa8cc3429bf77cfbc9..3abffaeffa1b7c422f5c097520bd71606ca13a79 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
@@ -5,6 +5,7 @@ const multipleChoiceSingleCorrectNode = {
     class: { default: 'multiple-choice-option-single-correct' },
     id: { default: uuidv4() },
     correct: { default: false },
+    answer: { default: false },
     feedback: { default: '' },
   },
   group: 'block questions',
@@ -19,6 +20,7 @@ const multipleChoiceSingleCorrectNode = {
           id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
           correct: JSON.parse(dom.getAttribute('correct').toLowerCase()),
+          answer: JSON.parse(dom.getAttribute('answer').toLowerCase()),
           feedback: dom.getAttribute('feedback'),
         };
       },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js
index 2d9c0de706a3aadc1e0b7f118e12588bf70d5a11..d7f82a8e53c47fef6fb9d8883905edbf0d3c308f 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js
@@ -5,6 +5,7 @@ const trueFalseNode = {
     class: { default: 'true-false-option' },
     id: { default: uuidv4() },
     correct: { default: false },
+    answer: { default: false },
     feedback: { default: '' },
   },
   group: 'block questions',
@@ -19,6 +20,7 @@ const trueFalseNode = {
           id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
           correct: JSON.parse(dom.getAttribute('correct').toLowerCase()),
+          answer: JSON.parse(dom.getAttribute('answer').toLowerCase()),
           feedback: dom.getAttribute('feedback'),
         };
       },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js
index 6182b81c7693eda0a4f40928ec3ca5cb545e27e6..f5f90c4c0a0fc733a499efe99f3140ceeb8f8df4 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js
@@ -5,6 +5,7 @@ const trueFalseSingleCorrectNode = {
     class: { default: 'true-false-single-correct-option' },
     id: { default: uuidv4() },
     correct: { default: false },
+    answer: { default: false },
     feedback: { default: '' },
   },
   group: 'block questions',
@@ -19,6 +20,7 @@ const trueFalseSingleCorrectNode = {
           id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
           correct: JSON.parse(dom.getAttribute('correct').toLowerCase()),
+          answer: JSON.parse(dom.getAttribute('answer').toLowerCase()),
           feedback: dom.getAttribute('feedback'),
         };
       },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js
index b0464c6c82ac1e244d271e369dee885c9c6cef8e..446f801fba977b7744352fbf109be9797b45a93d 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js
@@ -62,7 +62,7 @@ const CustomSwitch = ({ node, getPos }) => {
           main.dispatch(
             main.state.tr.setNodeMarkup(getPos(), undefined, {
               ...singleNode.node.attrs,
-              correctAnswer: !checkedAnswerMode,
+              answer: !checkedAnswerMode,
             }),
           );
         }
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index 9d1ff88675fc561093bc6fe927a8a419d8403f51..b3b15511d2588afbe79dd43974c8e9ccd46f810e 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -5,15 +5,12 @@ const multipleChoiceNode = {
     class: { default: 'multiple-choice-option' },
     id: { default: uuidv4() },
     correct: { default: false },
-    correctAnswer: { default: false },
+    answer: { default: false },
     feedback: { default: '' },
   },
   group: 'block questions',
   content: 'block*',
   defining: true,
-  // selectable: true,
-  // draggable: true,
-  // atom: true,
   parseDOM: [
     {
       tag: 'div.multiple-choice-option',
@@ -22,6 +19,7 @@ const multipleChoiceNode = {
           id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
           correct: JSON.parse(dom.getAttribute('correct').toLowerCase()),
+          answer: JSON.parse(dom.getAttribute('answer').toLowerCase()),
           feedback: dom.getAttribute('feedback'),
         };
       },