diff --git a/.gitignore b/.gitignore
index 781ecc2..e0a0247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,12 @@ dist/
 .env
 xml/*
 !xml/Sample.xml
+!xml/.gitkeep
+credentials/in/*
+credentials/out/*
+!credentials/in/.gitkeep
+!credentials/out/.gitkeep
+
+
+
 
diff --git a/addform.html b/addform.html
index 7005100..5050098 100644
--- a/addform.html
+++ b/addform.html
@@ -399,6 +399,8 @@
 		border-color:#eee;
 		margin-right: 0px;
 		margin-top: 16px;
+		background: #1D3557;
+
 	}
 	.popupbox q{
 		align-items: center;
@@ -880,11 +882,68 @@ document.addEventListener('DOMContentLoaded', function () {
 		}
 	})
 
+// Function for Finding the JSON File in the folder 
+function findFile(filePath) {
+  try {
+    const stats = fs.statSync(filePath);
+
+    if (stats.isFile()) {
+
+      // File exists
+    //   console.log(`File found at: ${filePath}`);
+      return true;
+    } else {
+    //   console.error(`Path is not a file: ${filePath}`);
+      return false;
+    }
+  } catch (err) {
+    // console.error(`File not found: ${filePath}`);
+    return false;
+  }
+}
+
+
+
+
 
 // Function to load XML from a file
 function loadXML(xmlFileName) {
 	var decodeData =""; 
+    var encodedXmlFilePath = `${xmlPath}${xmlFileName}`;
 	
+	var jsonDecodeData = "";
+	var jsonFileName = xmlFileName.split('.xml');
+	var encodedJsonFilePath = `${xmlPath}${jsonFileName[0]}_answer.json`;
+
+	var filelist = findFile(encodedJsonFilePath);
+
+	if(filelist !==  false)
+	{
+	//JSON File Read Function	
+	new Promise((resolve, reject) => {
+		fs.readFile(encodedJsonFilePath, 'utf8', (error, data) => {
+			if (error) {
+				console.error('Error reading file:', error);
+				reject(error);
+			} else {
+				if (isEncrypted === 'YES') {
+					
+					jsonDecodeData = decode(encodedJsonFilePath);
+					localStorage.setItem('json_Decode_Data_For_Mcq_Crt_Ans', jsonDecodeData);
+
+				} else{
+					jsonDecodeData = data;
+					localStorage.setItem('json_Decode_Data_For_Mcq_Crt_Ans', jsonDecodeData);
+
+				}	
+				resolve(jsonDecodeData);			
+
+			}
+		});
+	});
+ }
+
+//XML File Read Function
 	return new Promise((resolve, reject) => {
 		fs.readFile(`${xmlPath}${xmlFileName}`, 'utf8', (error, data) => {
 			if (error) {
@@ -893,11 +952,13 @@ function loadXML(xmlFileName) {
 			} else {
 				if (isEncrypted === 'YES') {
 					// decrypt function call go to decode.js
-					decodeData = decode(data);			
+					decodeData = decode(encodedXmlFilePath);
+					
 				} else{
 					decodeData = data;
 				}	
-
+                
+				console.log('jsonDecodeData : ', jsonDecodeData);
 				resolve(decodeData);
 				xml2json(decodeData);			
 				// json2nav();
diff --git a/credentials/in/.gitkeep b/credentials/in/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/credentials/out/.gitkeep b/credentials/out/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/dashboard.html b/dashboard.html
index 41ac827..28e08f3 100644
--- a/dashboard.html
+++ b/dashboard.html
@@ -302,6 +302,10 @@ margin-left: -16px;
 	<script src="assets/js/jquery.barfiller.js"></script>
 	<script src="index.js"></script>
 
+	<script src="encode.js"></script>
+	<script src="decode.js"></script>
+
+
 	
 	<!-- jquery js -->
 
@@ -377,6 +381,8 @@ sourceStream.on('error', (err) => {
 
 <script>
 
+const encode = require('./encode');	
+
 // Get the modal
 var modal = document.getElementById("myModal");
 
@@ -416,24 +422,165 @@ function validateFile(input) {
 	}
 }
 	
-// Function to download a file by filename
+// // Function to download a file by filename
+// function downloadFile(filename) {
+
+// const fileURL = `${xmlPath}${filename}`;
+// console.log(fileURL)
+
+// // Create a hidden anchor element to trigger the download
+// const a = document.createElement('a');
+// a.style.display = 'none';
+// a.href = fileURL;
+// a.download = filename;
+
+// // Append the anchor to the body and click it to trigger the download
+// document.body.appendChild(a);
+// a.click();
+
+// // Remove the anchor element
+// document.body.removeChild(a);
+// }
+
 function downloadFile(filename) {
 
-const fileURL = `${xmlPath}${filename}`;
-console.log(fileURL)
+const xmlFilePath = `${xmlPath}${filename}`;
+  
+const xmlFileNameParts = filename.split('.xml');
+const xmlBaseName = xmlFileNameParts[0];
+const jsonFileName = `${xmlBaseName}_answer.json`;
+const jsonFilePath = `${xmlPath}${jsonFileName}`;
+console.log(jsonFilePath);
 
-// Create a hidden anchor element to trigger the download
-const a = document.createElement('a');
-a.style.display = 'none';
-a.href = fileURL;
-a.download = filename;
 
-// Append the anchor to the body and click it to trigger the download
-document.body.appendChild(a);
-a.click();
+var fileList = findFile(jsonFilePath);
+console.log(fileList)
 
-// Remove the anchor element
-document.body.removeChild(a);
+  const downloadsPath = process.env.DOWNLOAD_XML_FILE_PATH;
+//   const downloadsPath = '/varr/www/html';
+  const isEncrypted = process.env.ENCRYPTED;
+  const filePathToSave = path.join(downloadsPath, filename);
+  const jsonFilePathToSave = path.join(downloadsPath, jsonFileName);
+  console.log(filePathToSave);
+  console.log(jsonFilePathToSave);
+  
+  
+  if(isEncrypted == 'YES'){
+
+	console.log('isEncrypted');
+
+// XML File
+
+  const decodeData = decode(xmlFilePath);
+  const encodeData = encode(decodeData, filePathToSave);
+
+
+// JSON File
+if(fileList !== false)
+  {
+  const jsonDecodeData = decode(jsonFilePath);
+  const jsonEncodeData = encode(jsonDecodeData, jsonFilePathToSave);
+  }
+
+
+  }
+  else{
+   
+	console.log('isEncrypted NOT');
+
+  //Download XML FIle
+  fs.writeFile(filePathToSave, xmlFilePath, 'utf-8', (err) => {
+     
+	 var errorMessage = "";
+	if (err) {
+           //  console.log(err.code);
+		if(err.code == 'EACCES'){
+
+			errorMessage = `Permission Denied.<br> Path: ${filePathToSave}`;
+		}
+		else if(err.code == 'ENOENT'){
+
+			errorMessage = `No Such File Directory. <br> Path: ${filePathToSave}`;
+		}
+		else{
+			errorMessage = `Unknown Error. <br> Path: ${filePathToSave}`;
+		}
+
+      Swal.fire({
+        title: "File Download Failed",
+		html: errorMessage,
+        icon: "error"
+      });
+    } else {
+      Swal.fire({
+        title: "File Downloaded",
+        icon: "success"
+      });
+    }
+  });
+
+  //Download JSON FIle
+  
+  if(fileList !== false)
+  {
+
+  fs.writeFile(jsonFilePathToSave, jsonFilePath, 'utf-8', (err) => {
+     
+	 var errorMessage = "";
+	if (err) {
+            console.log(err.code);
+		if(err.code == 'EACCES'){
+			errorMessage = `Permission Denied.<br> Path: ${jsonFilePathToSave}`;
+			console.log(errorMessage);
+		}
+		else if(err.code == 'ENOENT'){
+			errorMessage = `No Such File Directory. <br> Path: ${jsonFilePathToSave}`;
+			console.log(errorMessage);
+		}
+		else{
+			errorMessage = `Unknown Error. <br> Path: ${jsonFilePathToSave}`;
+			console.log(errorMessage);
+		}
+
+      Swal.fire({
+        title: "File Download Failed",
+		html: errorMessage,
+        icon: "error"
+      });
+    } else {
+      Swal.fire({
+        title: "File Downloaded",
+        icon: "success"
+      });
+    }
+  });
+
+}
+
+  }
+
+}
+
+
+
+// Function for Finding the JSON File in the folder 
+function findFile(filePath) {
+  try {
+    const stats = fs.statSync(filePath);
+
+    if (stats.isFile()) {
+
+      // File exists
+    //   console.log(`File found at: ${filePath}`);
+      return true;
+    } else {
+    //   console.error(`Path is not a file: ${filePath}`);
+      return false;
+    }
+  } catch (err) {
+    // console.error(`File not found: ${filePath}`);
+    return false;
+  }
 }
 
 </script>
diff --git a/decode.js b/decode.js
index a4a4dda..ae7ba20 100644
--- a/decode.js
+++ b/decode.js
@@ -1,23 +1,46 @@
 const crypto = require('crypto');
+function decode(encryptedDataFilePath) {
+
+    // console.log('encryptedDataFilePath :', encryptedDataFilePath);
+    const privateKeyPath = process.env.PRIVATE_KEY_PATH;
+    const encryptedFileContent = fs.readFileSync(encryptedDataFilePath);
+
+  // Extract the encrypted AES key, IV, and ciphertext
+  const encryptedAesKeyDec = encryptedFileContent.slice(0, 256); // Assuming 2048-bit RSA key, 256 bytes for the encrypted AES key
+  const ivDec = encryptedFileContent.slice(256, 256 + 16); // IV is 16 bytes
+  const ciphertext = encryptedFileContent.slice(256 + 16);
 
-function decode(encryptedData) {
     try {
-        const algorithm = 'aes-256-cbc';
-        const iv = Buffer.from(encryptedData.slice(0, 24), 'base64');
-        const keyHex = 'd0ca711dc0c599de0847cb86f415cd34d602a322f0f07dc89bce9e1481f481b3';
-        const derivedKey = Buffer.from(keyHex, 'hex');
-        const encryptedText = encryptedData.slice(24);
+            
+            // Decrypt the AES key with the private key
+            const privateKeyObj = fs.readFileSync(privateKeyPath, 'utf-8');
+            const decryptedAesKey = crypto.privateDecrypt(
+            {
+                key: privateKeyObj,
+                padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
+                oaepHash: 'sha256',
+            },
+            encryptedAesKeyDec
+            );
 
-        const decipher = crypto.createDecipheriv(algorithm, derivedKey, iv);
-        let decrypted = decipher.update(encryptedText, 'base64', 'utf8');
-        decrypted += decipher.final('utf8');
+            // Decrypt the file using AES
+            // const decipher = crypto.createDecipheriv('aes-128-cbc', decryptedAesKey, ivDec);
+            // let decryptedData = decipher.update(ciphertext);
+            // decryptedData = Buffer.concat([decryptedData, decipher.final()]);
 
-        console.log('Decrypted String:', decrypted);
-        return decrypted;
+            const decipher = crypto.createDecipheriv('aes-128-cbc', decryptedAesKey, ivDec);
+            let decryptedData = decipher.update(ciphertext, 'hex', 'utf-8');
+            decryptedData += decipher.final('utf-8');
+
+            // console.log('File decrypted successfully.');
+            // console.log('Decrypted String:', decryptedData);
+            return decryptedData;
+            
     } catch (error) {
-        console.error('Decryption failed:', error.message);
-        return null;
+        
+            console.error('Decryption failed:', error.message);
+            return null;
     }
 }
 
-  module.exports = decode;
+module.exports = decode;
diff --git a/encode.js b/encode.js
index eef840a..e7aa3b6 100644
--- a/encode.js
+++ b/encode.js
@@ -1,23 +1,93 @@
+const fs = require('fs');
 const crypto = require('crypto');
 
-function encode(inputString) {
-  try {
-    const algorithm = 'aes-256-cbc';
-    const iv = crypto.randomBytes(16);
-    const keyHex = 'd0ca711dc0c599de0847cb86f415cd34d602a322f0f07dc89bce9e1481f481b3';
-    const derivedKey = Buffer.from(keyHex, 'hex');
-    const cipher = crypto.createCipheriv(algorithm, derivedKey, iv);
+function encode(inputString, downloadFilePath = false) {
 
-    let encrypted = cipher.update(inputString, 'utf8', 'base64');
-    encrypted += cipher.final('base64');
+  console.log('encod downloadFilePath : ', downloadFilePath)
+
+  var certificatePath = '';
+
+  if(downloadFilePath !== false)
+  {
+     certificatePath = process.env.DOWNLOAD_PUBLIC_KEY_PATH;
+  }
+  else{
+     certificatePath = process.env.PUBLIC_KEY_PATH;
+  }
+
+try {
+
+    const aesKey = crypto.randomBytes(16); // Change the byte length for different key lengths
+    const iv = crypto.randomBytes(16); // Initialization vector for AES-CBC
+
+    // Encrypt the file using AES
+    const cipher = crypto.createCipheriv('aes-128-cbc', aesKey, iv);
+    let encryptedData = cipher.update(inputString);
+        encryptedData = Buffer.concat([encryptedData, cipher.final()]);
+
+    // Get the public key from the self-signed certificate
+    const publicKey = fs.readFileSync(certificatePath, 'utf-8');  
+
+    // Encrypt the AES key with the public key
+    const encryptedAesKey = crypto.publicEncrypt(
+    {
+      key: publicKey,
+      padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
+      oaepHash: 'sha256',
+    },
+    aesKey
+    );
+
+    // Save the encrypted file and encrypted AES key
+   var encryptedResult =  Buffer.concat([encryptedAesKey, iv, encryptedData])
+    console.log('File encrypted successfully.');
+    console.log('Encrypted String:', encryptedResult);
+
+    if(downloadFilePath !== false)
+    {
+      try {
+        fs.writeFileSync(downloadFilePath, encryptedResult);
+        console.log('File downloaded successfully.');
+        Swal.fire({
+          title: "File Downloaded",
+          icon: "success"
+        });
+      } catch (error) {
+        console.error('Error writing file:', error.message);
+        	 var errorMessage = "";
+
+        if(error.code == 'EACCES'){
+
+          errorMessage = `Permission Denied.<br> Path: ${downloadFilePath}`;
+        }
+        else if(error.code == 'ENOENT'){
+
+          errorMessage = `No Such File Directory. <br> Path: ${downloadFilePath}`;
+        }
+        else{
+          errorMessage = `Unknown Error. <br> Path: ${downloadFilePath}`;
+        }
+
+          Swal.fire({
+            title: "File Download Failed",
+            html: errorMessage,
+            icon: "warning"
+          }); 
+                 
+      }
+    }
+    else{
+
+      return encryptedResult;
+
+    }
+
+} catch (error) {
 
-    const encryptedData = iv.toString('base64') + encrypted;
-    console.log('Encrypted String:', encryptedData);
-    return encryptedData;
-  } catch (error) {
     console.error('Encryption failed:', error.message);
     return null;
-  }
+
+}
 }
 
 module.exports = encode;
diff --git a/encodeEnv.js b/encodeEnv.js
new file mode 100644
index 0000000..e35279c
--- /dev/null
+++ b/encodeEnv.js
@@ -0,0 +1,26 @@
+const fs = require('fs');
+
+// Function to encode data to base64
+function encodeToBase64(data) {
+  return Buffer.from(data, 'utf-8').toString('base64');
+}
+
+// Function to encode .env file to base64
+function encodeEnvFileToBase64(envFilePath, outputFilePath) {
+  // Read the content of the .env file
+  const envData = fs.readFileSync(envFilePath, 'utf-8');
+
+  // Encode the data to base64
+  const base64Data = encodeToBase64(envData);
+
+  // Write the base64-encoded data to a new file
+  fs.writeFileSync(outputFilePath, base64Data, 'utf-8');
+
+  console.log('File encoded to base64 successfully.');
+}
+
+// Example usage
+const envFilePath = '/.env';
+const outputFilePath = '/encoded_base64.env';
+
+encodeEnvFileToBase64(envFilePath, outputFilePath);
diff --git a/html2json.js b/html2json.js
index 8e9a63a..4ef33f4 100644
--- a/html2json.js
+++ b/html2json.js
@@ -84,7 +84,7 @@ function html2json() {
 
             var groupChoiceId = ((element.id).split('_').slice(-1)[0]).split('.').slice(0)[0];
             var individualChoiceId = (element.id).split('.').slice(-1)[0];
-            console.log('newChoiceTextField_'+groupChoiceId+'.'+individualChoiceId);
+            // console.log('newChoiceTextField_'+groupChoiceId+'.'+individualChoiceId);
             
             var choice_math_Enabled = document.getElementById('choice_math_' + groupChoiceId + '.' + individualChoiceId).checked;
             var choice_name = "";
@@ -276,6 +276,6 @@ function html2json() {
     // console.log((formData));
     // console.log(JSON.stringify(formData, null, 1));
     localStorage.setItem("json", JSON.stringify((formData)));
-    console.log(JSON.stringify(formData));
+    // console.log(JSON.stringify(formData));
     // console.log(OBJtoXML(({'question_paper' : formData})));
 }
diff --git a/json2html.js b/json2html.js
index aebdf74..d239567 100644
--- a/json2html.js
+++ b/json2html.js
@@ -5,6 +5,7 @@ function jsonToHtml(jsonData) {
 	localStorage.setItem('scroll', 1)
 	localStorage.setItem('EditNavExpend', 1)
 
+
 	const count = jsonData.sections.length;
     // console.log(`Count of sections: ${count}`);
 
@@ -138,6 +139,7 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo){
 		groupQuestion(false, false, false, questionTitle, questionDescription, questionType, questionSubType, mathEnabled, Choice, questionAreaId, questionRandomNo, questionMarks, questionUUID, questionDisplayMarks,);
 		// groupQuestion(QuestionObj);
 
+
 		Choice = Choice.slice(1);
 		Choice.forEach(function(choicenames, index) {
 		var choiceName = choicenames.choice_name;
diff --git a/json2xml.js b/json2xml.js
index 9a1060e..9830368 100644
--- a/json2xml.js
+++ b/json2xml.js
@@ -1,6 +1,143 @@
 function json2xml() {
     // console.clear();
     var obj = localStorage.getItem("json");
+    // var obj = `{
+    //     "question_paper_title": "<p><br></p>",
+    //     "question_paper_description": "<p><br></p>",
+    //     "max_marks": "",
+    //     "course_ID": "",
+    //     "course_Code": "",
+    //     "subject_ID": "",
+    //     "subject_Code": "",
+    //     "paper_No": "",
+    //     "subject_Name": "",
+    //     "sub_Paper_Prefix": "",
+    //     "question_Paper_uuid": "f676ad21-b0d2-4a80-8c77-6cd2b35f1b34",
+    //     "sections": [
+    //       {
+    //         "section_title": "<p>0</p>",
+    //         "section_description": "<p><br></p>",
+    //         "section_marks": "0",
+    //         "section_uuid": "7c62e594-3b93-444f-9fa6-a05f87869db6",
+    //         "section_display_marks": true,
+    //         "section_attempt_any": "",
+    //         "questions": [
+    //           {
+    //             "question": "<p>1</p>",
+    //             "question_description": "<p><br></p>",
+    //             "question_type": "group",
+    //             "question_sub_type": false,
+    //             "is_math_enabled": false,
+    //             "display_marks": true,
+    //             "marks": "",
+    //             "choice_question_uuid": "40f37294-e7cb-4f19-9166-72f7a04f6391",
+    //             "answers": [
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "387d9b85-4702-4e77-a8c3-29d713b7689e",
+    //                 "no": "a"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "1a6be686-9e7c-4b07-bf15-b9e07a01fd62",
+    //                 "no": "b"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "0640c05b-522e-422c-8050-0d5982aa3c74",
+    //                 "no": "c"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "e59f90b0-79d5-413e-85a4-ee3c181230d8",
+    //                 "no": "d"
+    //               }
+    //             ],
+    //             "correct_answer": ["1a6be686-9e7c-4b07-bf15-b9e07a01fd62"]
+    //           },
+    //           {
+    //             "question": "<p>2</p>",
+    //             "question_description": "<p><br></p>",
+    //             "question_type": "group",
+    //             "question_sub_type": false,
+    //             "is_math_enabled": false,
+    //             "display_marks": true,
+    //             "marks": "",
+    //             "choice_question_uuid": "7a1c83e7-e9ae-4424-9336-6135eaa6b833",
+    //             "answers": [
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "0cbb8330-8ce9-4d69-b547-68cee529a636",
+    //                 "no": "a"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "25dc4fdc-7bcf-4bea-aaa5-dc42a22c08b5",
+    //                 "no": "b"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "5b0da327-076f-488c-a46e-0b8251c83283",
+    //                 "no": "c"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "d3934305-d6fd-4601-8b1b-08067f47a8dd",
+    //                 "no": "d"
+    //               }
+    //             ],
+    //             "correct_answer": ["d3934305-d6fd-4601-8b1b-08067f47a8dd"]
+    //           },
+    //           {
+    //             "question": "<p>3</p>",
+    //             "question_description": "<p><br></p>",
+    //             "question_type": "group",
+    //             "question_sub_type": false,
+    //             "is_math_enabled": false,
+    //             "display_marks": true,
+    //             "marks": "",
+    //             "choice_question_uuid": "6f929b53-9ebc-40fb-800e-46c42b75f2d9",
+    //             "answers": [
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "f839312c-8de5-4cd5-8d6c-3ffd3b9efea6",
+    //                 "no": "a"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "905db769-82b2-4240-af06-fe0b15ee1f73",
+    //                 "no": "b"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "6a16126f-8100-49f8-ae33-71d4848030cf",
+    //                 "no": "c"
+    //               },
+    //               {
+    //                 "choice_name": "<p><br></p>",
+    //                 "is_math_enabled": false,
+    //                 "choice_uuid": "143f648a-d52c-42ff-9428-1c080326e1c8",
+    //                 "no": "d"
+    //               }
+    //             ],
+    //             "correct_answer": ["143f648a-d52c-42ff-9428-1c080326e1c8", "6a16126f-8100-49f8-ae33-71d4848030cf"]
+    //           }
+    //         ]
+    //       }
+    //     ]
+    //   }
+    //   `
     // console.log(obj);
     // console.log('***********************************************************');
 
@@ -177,7 +314,7 @@ function json2xml() {
         //create section related xml nodes
         var tempSection = questionPaper['sections'][section];
 
-        console.log(tempSection);
+        // console.log(tempSection);
 
         var sectionElement = createElementWithText(xmlDoc, rootItemsElement, 'Question', '', {
             'xsi:type': 'QuestionPaperSection',
@@ -199,6 +336,14 @@ function json2xml() {
         if (tempSection['questions'].length != 0) {
             for (question in tempSection['questions']) {
                 var singleQuestion = tempSection['questions'][question];
+                
+                //for Separate Correct Answer From MCQ 
+                if(singleQuestion.question_type == 'group'){
+
+                    separateCorrectAnswerFromMcqAsJson(singleQuestion)
+                }
+
+
                 if (singleQuestion.hasOwnProperty('question_type')) // normal questions
                 {
                     var singleQuestionElement = getXMLNodesOfQuestionData(singleQuestion);
@@ -224,3 +369,25 @@ function json2xml() {
     localStorage.setItem("xml", xmlString);
 
 }
+
+
+const outputJson = { questions: [] };
+
+function separateCorrectAnswerFromMcqAsJson(tempSection) {
+
+const questionId = tempSection.choice_question_uuid;
+const answers = tempSection.correct_answer;
+
+// Create an object for each question and push it to the output array
+outputJson.questions.push({
+    questionId,
+    answers
+});
+
+// Convert the output object to JSON string
+const outputJsonString = JSON.stringify(outputJson, null, 2);
+localStorage.setItem("Correct_Answer_Json", outputJsonString);
+console.log('outputJsonString : ', outputJsonString);
+
+}
+
diff --git a/package-lock.json b/package-lock.json
index 65ec8da..ad2b5b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,8 @@
         "cheerio": "^1.0.0-rc.12",
         "desandro-matches-selector": "^2.0.2",
         "dotenv": "^16.3.1",
+        "electron-dl": "^3.5.1",
+        "electron-download-manager": "^2.1.2",
         "ev-emitter": "^2.1.2",
         "fizzy-ui-utils": "^3.0.0",
         "formidable": "^3.5.1",
@@ -1043,6 +1045,27 @@
         "node": ">= 12.20.55"
       }
     },
+    "node_modules/electron-dl": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-3.5.1.tgz",
+      "integrity": "sha512-5Yb9s/iPVJ5mW5x3j6XkKxt7WEqREr/AhYxZmtEfW1ffQHs1+aGoiQ2fXCAU6UIXMnWog2MXK82vrxJsjA3nbQ==",
+      "dependencies": {
+        "ext-name": "^5.0.0",
+        "pupa": "^2.0.1",
+        "unused-filename": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/electron-download-manager": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/electron-download-manager/-/electron-download-manager-2.1.2.tgz",
+      "integrity": "sha512-9v8aeMVZTX69NjEveKlKfTlJY74twpKktTXrmDI+UcQHZg7FtwuqxWw0ZNrjtVAOBcVNKzwG4ekn44B+xhz1tg=="
+    },
     "node_modules/electron-packager": {
       "version": "17.1.2",
       "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-17.1.2.tgz",
@@ -1255,6 +1278,14 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/escape-goat": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
+      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -1278,6 +1309,29 @@
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
       "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
     },
+    "node_modules/ext-list": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "dependencies": {
+        "mime-db": "^1.28.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ext-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "dependencies": {
+        "ext-list": "^2.0.0",
+        "sort-keys-length": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -2145,6 +2199,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
@@ -2440,6 +2502,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/modify-filename": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz",
+      "integrity": "sha512-EickqnKq3kVVaZisYuCxhtKbZjInCuwgwZWyAmRIp1NTMhri7r3380/uqwrUHfaDiPzLVTuoNy4whX66bxPVog==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2947,6 +3017,17 @@
         "node": ">=6"
       }
     },
+    "node_modules/pupa": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
+      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
+      "dependencies": {
+        "escape-goat": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -3213,6 +3294,28 @@
         "node": ">=8"
       }
     },
+    "node_modules/sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
+      "dependencies": {
+        "is-plain-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sort-keys-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+      "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==",
+      "dependencies": {
+        "sort-keys": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -3415,6 +3518,26 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/unused-filename": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-2.1.0.tgz",
+      "integrity": "sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg==",
+      "dependencies": {
+        "modify-filename": "^1.1.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/unused-filename/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
diff --git a/package.json b/package.json
index bc37070..9fa0ad9 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,8 @@
     "cheerio": "^1.0.0-rc.12",
     "desandro-matches-selector": "^2.0.2",
     "dotenv": "^16.3.1",
+    "electron-dl": "^3.5.1",
+    "electron-download-manager": "^2.1.2",
     "ev-emitter": "^2.1.2",
     "fizzy-ui-utils": "^3.0.0",
     "formidable": "^3.5.1",
diff --git a/savexml.js b/savexml.js
index 99f5213..af79875 100644
--- a/savexml.js
+++ b/savexml.js
@@ -34,53 +34,90 @@ files.forEach((file) => {
 ////////
 //end the autosave
 
-function saveXmlToFile(xmlData, filePath,reorder=false, xmlfilename) {
-  // console.log(xmlfilename);
-  // console.log(filePath);
-  // Check if the file path is provided
-  if (!filePath) {
-    console.error('File path is required.');
-    return;
-  }
+  function saveXmlToFile(xmlData, filePath,reorder=false, xmlfilename, jsonData, jsonfilePath) {
+    // console.log(xmlData);
+    // console.log(filePath);
+    // Check if the file path is provided
+    if (!filePath) {
+      console.error('File path is required.');
+      return;
+    }
+  
+    // Write the XML data to the specified file path
+    fs.writeFileSync(filePath, xmlData, 'utf8', (err) => {
+      console.log("fs write inside ");
+      alert("fs write inside")
+      if (err) {
+        console.error('Error writing XML file:', err);
+      } else {
+        console.log('XML file saved successfully.');
+  
+        // Clear all data in local storage
+        localStorage.clear();
+  
+      }
+    });
 
-  // Write the XML data to the specified file path
-  fs.writeFileSync(filePath, xmlData, 'utf8', (err) => {
-    console.log("fs write inside ");
-    alert("fs write inside")
-    if (err) {
-      console.error('Error writing XML file:', err);
-    } else {
-      console.log('XML file saved successfully.');
+    if(jsonData !== ""){
 
-      // Clear all data in local storage
-      localStorage.clear();
+     // Write the JSON data to the specified file path
+    fs.writeFileSync(jsonfilePath, jsonData, 'utf8', (err) => {
+
+      if (err) {
+        console.error('Error writing XML file:', err);
+      } else {
+        console.log('JSON file saved successfully.');
+
+        localStorage.clear();
+
+      }
+    }); 
 
     }
-  });
-  localStorage.clear();
-  if(reorder){
-    window.location.reload();
-  }else{
-    window.location.href = 'addform.html?filename=' + xmlfilename;
-    //  window.location.reload();
+ 
 
-  }
+
+    localStorage.clear();
+    if(reorder){
+      window.location.reload();
+    }else{
+      window.location.href = 'addform.html?filename=' + xmlfilename;
+      //  window.location.reload();
   
-  }
+    }
+    
+    }
 
 
 function savexml(UserFilename,reorder=false) {
   console.log("reorder",reorder);
   // Get the XML string from localStorage
   var xmlString = localStorage.getItem("xml");
+  var jsonString = localStorage.getItem("Correct_Answer_Json");
+  console.log('save json : ', jsonString);
+  console.log('save xml : ', xmlString);
+
   //check Encrypted or not
   var enc = "";
+  var encJson = "";
   if (isEncrypted === 'YES') {
     // Encrypt 
     enc = encode(xmlString);
+    if(jsonString)
+    {
+      encJson = encode(jsonString);
+    }
   } else {
     enc = xmlString;
+    if(jsonString)
+    {
+      encJson = jsonString; 
+    }
+    
   }
+  
+  console.log('save xml : ', enc);
+
   //XmlPath get from .env 
   const xmlPathenv=process.env.XML_FILE_PATH;
   const xmlPath = path.join(__dirname, xmlPathenv)
@@ -89,20 +126,20 @@ function savexml(UserFilename,reorder=false) {
 
   // Create a filename using on the subtitle
   var xmlfilename = `${UserFilename}.xml`;
-  console.log('xmlfilename : ', xmlfilename)
-  // var jsonfilename = `${UserFilename}.json`;
+  var jsonfilename = `${UserFilename}_answer.json`;
 
   // file path where you want to save the XML file
   // const xmlfilePath = process.cwd() + `/${xmlPath}` + xmlfilename;
 
   const xmlfilePath = `${xmlPath}` + xmlfilename;
+  const jsonfilePath = `${xmlPath}` + jsonfilename;
   // const jsonfilePath = process.cwd() + '/xml/' + jsonfilename;
 
   if(reorder){
-    saveXmlToFile(enc, xmlfilePath,reorder=true, xmlfilename);
+    saveXmlToFile(enc, xmlfilePath,reorder=true, xmlfilename, encJson, jsonfilePath);
   }else{
     // Call the function to save the XML file
-    saveXmlToFile(enc, xmlfilePath, false, xmlfilename);
+    saveXmlToFile(enc, xmlfilePath, false, xmlfilename, encJson, jsonfilePath);
   }
 }
 
diff --git a/style.css b/style.css
index 5076511..0e86996 100644
--- a/style.css
+++ b/style.css
@@ -3712,6 +3712,10 @@ width:85px;
 .modal_form_button button:hover{
     background: #bf303b;
 
+}
+.popup-save button:hover{
+    background: #bf303b;
+
 }
 
 ::-webkit-scrollbar-thumb {
diff --git a/xml/.gitkeep b/xml/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/xml/Sample.xml b/xml/Sample.xml
new file mode 100644
index 0000000..5e65272
--- /dev/null
+++ b/xml/Sample.xml
@@ -0,0 +1 @@
+<QuestionPaper xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Id="959195d5-1254-4d52-bdb9-be13af31720b" MaxMarks="1" CourseId="1" CourseCode="1" SubjectId="1" SubjectCode="1" PaperNo="1" SubjectName="1" SubPaperPrefix="1"><Title>&lt;p&gt;&lt;strong&gt;Monthly Question Paper  what &lt;/strong&gt;&lt;span class="ql-cursor"&gt;&lt;/span&gt;&lt;/p&gt;</Title><Subtitle>&lt;p&gt;May Month Test Question Paper&lt;/p&gt;</Subtitle><Items><Question xsi:type="QuestionPaperSection" Id="a4436232-365c-4a7b-bdf0-b2375055967b" Type="Section" No="&lt;p&gt;Section c&lt;/p&gt;" Order="0"><Text>&lt;p&gt;Section c&lt;/p&gt;</Text><Subtext>&lt;p&gt;Two Mark Question&lt;/p&gt;</Subtext><Marks>2000</Marks><DisplayMarks>true</DisplayMarks><AttemptAny>2</AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="0b17c240-f758-4198-adc7-2614af0874cf" type="Descriptive"><Text>&lt;p&gt;What is Laptop&lt;/p&gt;</Text><Subtext>&lt;p&gt;Describe 20 words&lt;/p&gt;</Subtext><Marks>1000</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math></Question><Question xsi:type="MultiChoiceQuestion" Id="7e4176dd-9a55-40e2-9f08-254369d6dc7d" type="Mcq"><Text>&lt;p&gt;Who discover the laptop&lt;/p&gt;</Text><Subtext>&lt;p&gt;pick one answer&lt;/p&gt;</Subtext><Marks>1000</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math><HasMultipleAnswers>true</HasMultipleAnswers><Choices><Choice><Id>8322d364-db1d-444d-bab0-dec8dd668375</Id><No>a</No><Text>&lt;p&gt;ch 1&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>2b7a8bd3-db2b-4a97-bc78-59a77e72e0a7</Id><No>b</No><Text>&lt;p&gt;ch 1&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>1a755857-3e4d-436a-a4f7-aaf29171e349</Id><No>c</No><Text>&lt;p&gt;ch 2&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>ba1299c9-97e4-4d99-a183-e1f7b719bb96</Id><No>d</No><Text>\sqrt2</Text><Math>true</Math></Choice></Choices></Question><Question xsi:type="QuestionGroup" Id="9bfef469-b326-43bd-88ca-9965028eac7a" Type="QuestionGroup" No="&lt;p&gt;s1 q1&lt;/p&gt;" Order="0"><Text>&lt;p&gt;s1 q1&lt;/p&gt;</Text><Subtext>&lt;p&gt;Description&lt;/p&gt;</Subtext><Marks>1000</Marks><DisplayMarks>false</DisplayMarks><AttemptAny>1</AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="1e1781cd-3a73-4180-a4c1-23d66d14d052" type="Descriptive"><Text>&lt;p&gt;Describe the Mobile Phone&lt;/p&gt;</Text><Subtext>&lt;p&gt;Describe 20 words&lt;/p&gt;</Subtext><Marks>1000</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math></Question><Question xsi:type="MultiChoiceQuestion" Id="09eff58f-09ad-471a-a897-ad4c24b16d0d" type="Mcq"><Text>&lt;p&gt;1&lt;/p&gt;</Text><Subtext>&lt;p&gt;pick one answer&lt;/p&gt;</Subtext><Marks>1000</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math><HasMultipleAnswers>false</HasMultipleAnswers><Choices><Choice><Id>7d15a61c-e4dc-47a5-93d1-41f00611814c</Id><No>a</No><Text>&lt;p&gt;ch 1&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>e777ddfe-d7b3-4563-8282-944f46716bff</Id><No>b</No><Text>&lt;p&gt;ch 2&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>fb957850-9d6b-4fed-8ad9-bfaf8261a7e8</Id><No>c</No><Text>&lt;p&gt;ch 3&lt;/p&gt;</Text><Math>false</Math></Choice></Choices></Question><Question xsi:type="QuestionGroup" Id="1f3b8e56-a503-4ce2-822a-2e76d9de29fa" Type="QuestionGroup" No="&lt;p&gt;s1 q2&lt;/p&gt;" Order="0"><Text>&lt;p&gt;s1 q2&lt;/p&gt;</Text><Subtext>&lt;p&gt;Description&lt;/p&gt;</Subtext><Marks>1000</Marks><DisplayMarks>false</DisplayMarks><AttemptAny>2</AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="c163298c-fabb-464b-a96c-0dc17a5379fe" type="Descriptive"><Text>&lt;p&gt;1&lt;/p&gt;</Text><Subtext>&lt;p&gt;Describe 20 words&lt;/p&gt;</Subtext><Marks>500</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math></Question><Question xsi:type="MultiChoiceQuestion" Id="5be8bfa0-1500-498d-b666-0c0bf524c3d1" type="Mcq"><Text>&lt;p&gt;Who Discover the mouse&lt;/p&gt;</Text><Subtext>&lt;p&gt;pick one answer&lt;/p&gt;</Subtext><Marks>500</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math><HasMultipleAnswers>false</HasMultipleAnswers><Choices><Choice><Id>a80ce15a-bed0-4543-ab0f-361f55ba5a27</Id><No>a</No><Text>&lt;p&gt;ch 1&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>b73e9ab0-5351-4e62-83a9-69a6a87ac3c2</Id><No>b</No><Text>&lt;p&gt;ch2&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>4b798f3d-5004-49d1-b008-57fb607d3e68</Id><No>c</No><Text>&lt;p&gt;ch3&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>0dc2a56e-0d28-4f2a-bfc2-18e105569c07</Id><No>d</No><Text>&lt;p&gt;ch4&lt;/p&gt;</Text><Math>false</Math></Choice></Choices></Question><Question xsi:type="QuestionGroup" Id="cae24d9a-26a8-45ee-9902-ff8eeb925fd9" Type="QuestionGroup" No="&lt;p&gt;s1 q3&lt;/p&gt;" Order="0"><Text>&lt;p&gt;s1 q3&lt;/p&gt;</Text><Subtext>&lt;p&gt;Desciption&lt;/p&gt;</Subtext><Marks>500</Marks><DisplayMarks>false</DisplayMarks><AttemptAny>1</AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="f63ab51d-3e8e-4289-b37c-3621bb2f9905" type="Descriptive"><Text>&lt;p&gt;What is RAM&lt;/p&gt;</Text><Subtext>&lt;p&gt;Describe 20 words&lt;/p&gt;</Subtext><Marks>500</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math></Question><Question xsi:type="MultiChoiceQuestion" Id="395acd1b-4d07-427d-b4ee-e2f42620d406" type="Mcq"><Text>&lt;p&gt;Who Discover the RAM&lt;/p&gt;</Text><Subtext>&lt;p&gt;pick one answer&lt;/p&gt;</Subtext><Marks>500</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math><HasMultipleAnswers>false</HasMultipleAnswers><Choices><Choice><Id>10d6607c-29a8-4885-ad12-f2118e12f1e7</Id><No>a</No><Text>&lt;p&gt;ch 1&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>b831ded1-3550-432a-b0bb-a180847a14b9</Id><No>b</No><Text>&lt;p&gt;ch 2&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>32c91506-b8af-44f7-b548-97fd3c456cfb</Id><No>c</No><Text>&lt;p&gt;ch 3&lt;/p&gt;</Text><Math>false</Math></Choice></Choices></Question><Question xsi:type="QuestionGroup" Id="45f5fbf0-fe80-468c-ba8d-8ffa9aeb4f4f" Type="QuestionGroup" No="&lt;p&gt;s1 q4&lt;/p&gt;" Order="0"><Text>&lt;p&gt;s1 q4&lt;/p&gt;</Text><Subtext>&lt;p&gt;description&lt;/p&gt;</Subtext><Marks>500</Marks><DisplayMarks>false</DisplayMarks><AttemptAny>2</AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="bbdecd6b-70a2-4bfd-9fd9-f1588abca0c0" type="Descriptive"><Text>&lt;p&gt;solve it that is tje what is the werwerer&lt;/p&gt;</Text><Subtext>\sqrt{25}=?</Subtext><Marks>250</Marks><DispalyMarks>false</DispalyMarks><Math>true</Math></Question><Question xsi:type="MultiChoiceQuestion" Id="51e6d2e7-97ee-47e9-b975-faf41abb719f" type="Mcq"><Text>&lt;p&gt;solve it&lt;/p&gt;</Text><Subtext>\sqrt{25}=?</Subtext><Marks>250</Marks><DispalyMarks>false</DispalyMarks><Math>true</Math><HasMultipleAnswers>false</HasMultipleAnswers><Choices><Choice><Id>213a3ffd-4680-456a-b459-8e0a5023838d</Id><No>a</No><Text>5</Text><Math>true</Math></Choice><Choice><Id>98a2297b-08fe-416d-acb8-28794962d2e7</Id><No>b</No><Text>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>04ae1f66-8099-4fc9-b3f1-09c12a303646</Id><No>c</No><Text>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>89d8e74d-f3fb-4817-b756-aca13b52b41e</Id><No>d</No><Text>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Text><Math>false</Math></Choice></Choices></Question><Question xsi:type="DescriptiveQuestion" Id="bf721401-026d-4ff4-9199-36e8e7f09634" type="Descriptive"><Text>&lt;p&gt;1&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>250</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math></Question></Items></Question></Items></Question></Items></Question></Items></Question><Question xsi:type="DescriptiveQuestion" Id="a91b247c-70fd-4819-b05a-f407ba34748f" type="Descriptive"><Text>&lt;p&gt;1&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>1000</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math></Question></Items></Question><Question xsi:type="QuestionPaperSection" Id="7c159797-7d25-43f9-8f57-7138d21b1d79" Type="Section" No="&lt;p&gt;Section B&lt;/p&gt;" Order="0"><Text>&lt;p&gt;Section B&lt;/p&gt;</Text><Subtext>&lt;p&gt;Description&lt;/p&gt;</Subtext><Marks>20</Marks><DisplayMarks>true</DisplayMarks><AttemptAny></AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="e5f79f1f-bd85-4373-a74f-9a594fcac8a3" type="Descriptive"><Text>&lt;p&gt;S2 Q1&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math></Question><Question xsi:type="QuestionGroup" Id="230c668a-a043-41db-96cf-a8be37d5695b" Type="QuestionGroup" No="&lt;p&gt;S2 QG1 2&lt;/p&gt;" Order="0"><Text>&lt;p&gt;S2 QG1 2&lt;/p&gt;</Text><Subtext>&lt;p&gt;dfdasdfasd&lt;/p&gt;</Subtext><Marks>16</Marks><DisplayMarks>true</DisplayMarks><AttemptAny></AttemptAny><Items><Question xsi:type="MultiChoiceQuestion" Id="855470d9-9c63-4951-8a0a-b4730dddb9b7" type="Mcq"><Text>&lt;p&gt;S2 QG1 Q2&lt;/p&gt;</Text><Subtext>&lt;p&gt;sdgdfgdfgdfgsdgsddgsdgsddgsdgsddgfs&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math><HasMultipleAnswers>true</HasMultipleAnswers><Choices><Choice><Id>a04d0e78-7892-4a49-9e45-363be6985aa3</Id><No>a</No><Text>&lt;p&gt;fhgfdgh&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>be8a955e-dadd-44f0-9f59-a182fa7ebb8f</Id><No>b</No><Text>&lt;p&gt;fdghdfgh&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>47bb7bb9-337e-4838-9fbf-1c8678ba3e22</Id><No>c</No><Text>&lt;p&gt;fghdgfghdgf&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>61fec00a-4075-4807-88bc-be278a3c4992</Id><No>d</No><Text>&lt;p&gt;dfghdfghd&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>db3f1ca5-083a-432d-8fae-f94d944e4989</Id><No>e</No><Text>&lt;p&gt;dfgdfgsdfg&lt;/p&gt;</Text><Math>false</Math></Choice></Choices></Question><Question xsi:type="DescriptiveQuestion" Id="73ca7e23-e77a-4725-ac59-f2ce2e894848" type="Descriptive"><Text>&lt;p&gt;S2 QG2 Q1&lt;/p&gt;</Text><Subtext>&lt;p&gt;dsfgsdfgsdfgsdfg&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math></Question><Question xsi:type="QuestionGroup" Id="d0e87f95-fbff-41fe-9cfb-78c27647ee8c" Type="QuestionGroup" No="&lt;p&gt;S2 QG2&lt;/p&gt;" Order="0"><Text>&lt;p&gt;S2 QG2&lt;/p&gt;</Text><Subtext>&lt;p&gt;dfgsdfgsdfgsdfg&lt;/p&gt;</Subtext><Marks>12</Marks><DisplayMarks>false</DisplayMarks><AttemptAny></AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="21639eec-1906-4526-a700-a23f7b7613f1" type="Descriptive"><Text>&lt;p&gt;S2 QG2 Q1&lt;/p&gt;</Text><Subtext>&lt;p&gt;fdgdsfgsdfgsdfgsdfgsdfg&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>false</DispalyMarks><Math>false</Math></Question><Question xsi:type="MultiChoiceQuestion" Id="db8b7160-d2f6-467c-a864-6a1e009442ec" type="Mcq"><Text>&lt;p&gt;S2 QG2 Q2&lt;/p&gt;</Text><Subtext>&lt;p&gt;fdgsdfgdsfgsdfg&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math><HasMultipleAnswers>true</HasMultipleAnswers><Choices><Choice><Id>0df34d5a-927a-4ecf-b22f-8acf66a2f979</Id><No>a</No><Text>&lt;p&gt;fsdgsdfgsdfgsdf&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>03cbc474-aeea-4a81-9c97-ee14843f3e89</Id><No>b</No><Text>&lt;p&gt;sdfgsdfgsdfgsd&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>038e0125-dab8-48e0-9e89-2b1417221b9b</Id><No>c</No><Text>&lt;p&gt;dfgdsfgdsf&lt;/p&gt;</Text><Math>false</Math></Choice><Choice><Id>eaba5d1a-a0c5-4d8e-827f-03fd094345d9</Id><No>d</No><Text>&lt;p&gt;fgsdfgdsfgsdfgdsfgdfgsdf&lt;/p&gt;</Text><Math>false</Math></Choice></Choices></Question><Question xsi:type="QuestionGroup" Id="74fb34a1-80f1-4526-b4ac-f4a4f76c1445" Type="QuestionGroup" No="&lt;p&gt;S2 QG3&lt;/p&gt;" Order="0"><Text>&lt;p&gt;S2 QG3&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>8</Marks><DisplayMarks>false</DisplayMarks><AttemptAny></AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="450aa835-0af5-4554-9334-df48efc828bc" type="Descriptive"><Text>&lt;p&gt;S2 QG3 Q1&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math></Question><Question xsi:type="MultiChoiceQuestion" Id="2f208c1a-2fe1-4006-9879-f40dd38a7d2f" type="Mcq"><Text>&lt;p&gt;S2 QG3 Q2&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math><HasMultipleAnswers>true</HasMultipleAnswers><Choices><Choice><Id>94c5fd0e-444f-4fca-a516-a6bb93b52602</Id><No>a</No><Text>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Text><Math>false</Math></Choice></Choices></Question><Question xsi:type="QuestionGroup" Id="dac0772a-3bfc-435b-b81b-3964cf35a7f9" Type="QuestionGroup" No="&lt;p&gt;S2 QG4&lt;/p&gt;" Order="0"><Text>&lt;p&gt;S2 QG4&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>4</Marks><DisplayMarks>true</DisplayMarks><AttemptAny></AttemptAny><Items><Question xsi:type="DescriptiveQuestion" Id="9247763d-c1c3-403b-be8a-de732254525a" type="Descriptive"><Text>&lt;p&gt;S2 QG4 Q1&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math></Question><Question xsi:type="MultiChoiceQuestion" Id="1e9541b2-e0b9-4965-97be-e98b4714cb12" type="Mcq"><Text>&lt;p&gt;S2 QG4 Q2&lt;/p&gt;</Text><Subtext>&lt;p&gt;xfdgsdfgsdfgsdfgsdfgsdfgsdfgsdfgsd&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math><HasMultipleAnswers>true</HasMultipleAnswers><Choices><Choice><Id>30dbde59-a12e-4fb5-b0cf-2a0ef997ece6</Id><No>a</No><Text></Text><Math>true</Math></Choice><Choice><Id>1394d4bd-cd38-47a7-9e80-c4f26466cc78</Id><No>b</No><Text></Text><Math>true</Math></Choice><Choice><Id>43c3971a-9799-4698-8570-6048d4b79b67</Id><No>c</No><Text></Text><Math>true</Math></Choice><Choice><Id>8410a092-c4e1-46da-8215-7bb8b3b50dac</Id><No>d</No><Text></Text><Math>true</Math></Choice></Choices></Question></Items></Question></Items></Question></Items></Question></Items></Question><Question xsi:type="MultiChoiceQuestion" Id="64deae58-b4ba-4535-801e-5d7cdfedc023" type="Mcq"><Text>&lt;p&gt;S2 Q2&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks>2</Marks><DispalyMarks>true</DispalyMarks><Math>false</Math><HasMultipleAnswers>true</HasMultipleAnswers><Choices><Choice><Id>fa186388-6f21-40dc-bf5c-e52910f560a1</Id><No>a</No><Text>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Text><Math>false</Math></Choice></Choices></Question><Question xsi:type="DescriptiveQuestion" Id="065203ad-9a7c-4034-bcd4-7088af2645c3" type="Descriptive"><Text>&lt;p&gt;test&lt;/p&gt;</Text><Subtext>&lt;p&gt;&lt;br&gt;&lt;/p&gt;</Subtext><Marks></Marks><DispalyMarks>true</DispalyMarks><Math>false</Math></Question></Items></Question></Items></QuestionPaper>
\ No newline at end of file
diff --git a/xml2json.js b/xml2json.js
index e8a7d6a..fd07522 100644
--- a/xml2json.js
+++ b/xml2json.js
@@ -1,9 +1,11 @@
-
 function  xml2json(xmlData) {
 // console.clear();
 // console.log('xml to json converstion');
 // console.log(xmlData);
 
+var jsonDecodeData = localStorage.getItem('json_Decode_Data_For_Mcq_Crt_Ans');
+// console.log(jsonDecodeData);
+
 function getAttributesOfXMLNode(node)
 {
 	// Get attributes of the node (if any)
@@ -45,6 +47,7 @@ function getQuestionsNodes(questionNode,type)
 				questionObj['display_marks'] = questionNode.childNodes[3].firstChild.nodeValue;
 				questionObj['is_math_enabled'] = questionNode.childNodes[4].firstChild.nodeValue;
 				questionObj['answers'] = [];
+				questionObj['correct_answer'] = [];
 
 				var choiceList = questionNode.childNodes[6].childNodes;
 				
@@ -61,6 +64,36 @@ function getQuestionsNodes(questionNode,type)
 						 questionObj['answers'].push(tempChoiceobj);
 					}
 				}
+				if(jsonDecodeData !== null)
+				{   
+					var jsonParsedData = JSON.parse(jsonDecodeData);
+
+					// console.log('jsonParsedData : ', jsonParsedData)
+
+					// Iterate over each question
+					for (const question of jsonParsedData.questions) {
+
+						const questionId = question.questionId;
+						const answers = question.answers;
+                        
+						console.log(typeof answers)
+
+						// console.log(`Question ID: ${questionId}`);
+                                                
+                        if(answers !== undefined)  {
+						// console.log(`Not Undifined Answer`);
+						for (const answer of answers) {
+
+							// console.log(`  Answer ID: ${answer}`);
+
+							if(questionId == questionObj['attributes']['Id']) {
+								questionObj['correct_answer'].push(answer); 
+							}
+						}
+					  }
+				}
+					// console.log('jsonDecodeData.length', jsonDecodeData);
+				}
 		}
 		return questionObj;
 
@@ -165,10 +198,12 @@ jsonObj['sections'] = [];
 
     var jsonData = JSON.stringify(jsonObj);
 	// console.log('Xml to Json Conversion ');
-	// console.log(jsonData);
+	console.log('jsonData : ', jsonData);
 	// console.log(jsonObj);
 	jsonToHtml(jsonObj);
 	// console.log(jsonToHtml(jsonObj))
+	localStorage.removeItem('json_Decode_Data_For_Mcq_Crt_Ans');
+
 }