Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r8bb8d77a378de6ee1231195294e2b078248598c9 -r78aa75a621d7da163d86f6148a2666bc27eddea3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 8bb8d77a378de6ee1231195294e2b078248598c9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 78aa75a621d7da163d86f6148a2666bc27eddea3)
@@ -144,7 +144,12 @@
     public static final String MAP_DISABLED_QUESTIONS					="mapDisabledQuestions";
     public static final String MAP_GENERAL_OPTIONS_CONTENT				="mapGeneralOptionsContent";
     public static final String MAP_GENERAL_SELECTED_OPTIONS_CONTENT		="mapGeneralSelectedOptionsContent";
+    public static final String MAP_GENERAL_CHECKED_OPTIONS_CONTENT		="mapGeneralCheckedOptionsContent";
+    public static final String MAP_LEARNER_QUESTIONS_CONTENT			="mapLearnerQuestionsContent";
+    public static final String MAP_LEARNER_CHECKED_OPTIONS_CONTENT		="mapLearnerCheckedOptionsContent";
     
+    
+    
     public static final String MAP_WEIGHTS								="mapWeights";
     public static final String MAP_CHECKBOX_STATES						="mapCheckBoxStates";
     public static final String MAP_SELECTED_OPTIONS						="mapSelectedOptions";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -re47ae0076c4cd0eae4874a006baaaa8da251c667 -r78aa75a621d7da163d86f6148a2666bc27eddea3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision e47ae0076c4cd0eae4874a006baaaa8da251c667)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 78aa75a621d7da163d86f6148a2666bc27eddea3)
@@ -382,8 +382,6 @@
     }
 
     
-    
-    
     public void simulatePropertyInspector_RunOffline(HttpServletRequest request)
     {
     	IMcService qaService =McUtils.getToolService(request);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -re47ae0076c4cd0eae4874a006baaaa8da251c667 -r78aa75a621d7da163d86f6148a2666bc27eddea3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision e47ae0076c4cd0eae4874a006baaaa8da251c667)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 78aa75a621d7da163d86f6148a2666bc27eddea3)
@@ -2201,9 +2201,61 @@
     		logger.debug("questionIndex: " + mcLearningForm.getQuestionIndex());
     		logger.debug("optionIndex: " + mcLearningForm.getOptionIndex());
     		logger.debug("checked: " + mcLearningForm.getChecked());
+    		
+    		Map mapGeneralCheckedOptionsContent=(Map) request.getSession().getAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT);
+    		logger.debug("mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
+    		
+    		if (mapGeneralCheckedOptionsContent.size() == 0)
+    		{
+    			logger.debug("mapGeneralCheckedOptionsContent size is 0");
+    			Map mapLeanerCheckedOptionsContent= new TreeMap(new McComparator());
+    			
+    			if (mcLearningForm.getChecked().equals("true"))
+    				mapLeanerCheckedOptionsContent.put(mcLearningForm.getOptionIndex(), "CHECKED");
+    			else
+    				mapLeanerCheckedOptionsContent.remove(mcLearningForm.getOptionIndex());
+    			
+    			mapGeneralCheckedOptionsContent.put(mcLearningForm.getQuestionIndex(),mapLeanerCheckedOptionsContent);
+    			request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
+    		}
+    		else
+    		{
+    			Map mapCurrentOptions=(Map) mapGeneralCheckedOptionsContent.get(questionIndex);
+    			
+    			logger.debug("mapCurrentOptions: " + mapCurrentOptions);
+    			if (mapCurrentOptions != null)
+    			{
+        			if (mcLearningForm.getChecked().equals("true"))
+        				mapCurrentOptions.put(mcLearningForm.getOptionIndex(), "CHECKED");
+        			else
+        				mapCurrentOptions.remove(mcLearningForm.getOptionIndex());
+    				
+        			logger.debug("updated mapCurrentOptions: " + mapCurrentOptions);
+        			
+        			mapGeneralCheckedOptionsContent.put(mcLearningForm.getQuestionIndex(),mapCurrentOptions);
+        			request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);	
+    			}
+    			else
+    			{
+    				logger.debug("no options for this questions has been selected yet");
+        			Map mapLeanerCheckedOptionsContent= new TreeMap(new McComparator());
+        			        			
+        			if (mcLearningForm.getChecked().equals("true"))
+        				mapLeanerCheckedOptionsContent.put(mcLearningForm.getOptionIndex(), "CHECKED");
+        			else
+        				mapLeanerCheckedOptionsContent.remove(mcLearningForm.getOptionIndex());        			
+        			
+        			mapGeneralCheckedOptionsContent.put(mcLearningForm.getQuestionIndex(),mapLeanerCheckedOptionsContent);
+        			request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
+    			}
+    		}
+    		
+    		mapGeneralCheckedOptionsContent=(Map) request.getSession().getAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT);
+    		logger.debug("final mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
+    		
+    		
     	}
     	
-    	
  		return (mapping.findForward(LOAD_LEARNER));
   }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -re47ae0076c4cd0eae4874a006baaaa8da251c667 -r78aa75a621d7da163d86f6148a2666bc27eddea3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision e47ae0076c4cd0eae4874a006baaaa8da251c667)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 78aa75a621d7da163d86f6148a2666bc27eddea3)
@@ -326,6 +326,15 @@
 	    
 		logger.debug("IS_SHOW_FEEDBACK: " + new Boolean(mcContent.isShowFeedback()).toString());
 	    request.getSession().setAttribute(IS_SHOW_FEEDBACK, new Boolean(mcContent.isShowFeedback()).toString());
+	    
+	    Map mapGeneralCheckedOptionsContent= new TreeMap(new McComparator());
+	    request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
+	    
+	    Map mapLeanerCheckedOptionsContent= new TreeMap(new McComparator());
+	    request.getSession().setAttribute(MAP_LEARNER_CHECKED_OPTIONS_CONTENT, mapLeanerCheckedOptionsContent);
+	    
+	    
+	    
 	    /* .. till here */
 	}
 	
Index: lams_tool_lamc/web/CombinedAnswersContent.jsp
===================================================================
diff -u -re47ae0076c4cd0eae4874a006baaaa8da251c667 -r78aa75a621d7da163d86f6148a2666bc27eddea3
--- lams_tool_lamc/web/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision e47ae0076c4cd0eae4874a006baaaa8da251c667)
+++ lams_tool_lamc/web/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 78aa75a621d7da163d86f6148a2666bc27eddea3)
@@ -29,7 +29,7 @@
 					  </tr>
 					</c:if> 			
 
-			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
+			 		<c:if test="${sessionScope.isRetries == 'true' && sessionScope.passMark > 0}"> 		
 					  <tr>
 					  	<td align=left class="input" valign=top colspan=2> 
 						  	<font size=2> <b>  <bean:message key="label.learner.message"/> (<c:out value="${sessionScope.passMark}"/><bean:message key="label.percent"/> ) 
@@ -59,30 +59,68 @@
 										<c:if test="${sessionScope.mainQueIndex == sessionScope.queIndex}"> 		
 									  		<c:forEach var="subEntry" items="${mainEntry.value}">
 									  		
-										
-												<tr> 
-													<td align=left class="input" valign=top> 
-														<input type="checkbox" 
-														name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>
-														onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; 
-														document.forms[0].questionIndex.value=<c:out value="${sessionScope.queIndex}"/>; 
-														document.forms[0].optionIndex.value=<c:out value="${subEntry.key}"/>;
-														if (this.checked == 1)
-														{
-															document.forms[0].checked.value=true;
-														}
-														else
-														{
-															document.forms[0].checked.value=false;
-														}
-														document.forms[0].submit();"> 
-													</td> 
-													<td align=left class="input" valign=top> 
-														<c:out value="${subEntry.value}"/>
-													</td>
-												</tr>										
 
-										
+							  		  	 		<c:set var="checkedOptionFound" scope="request" value="0"/>
+												<!-- traverse the selected option from here --> 									  		
+	  											<c:forEach var="selectedMainEntry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
+														<c:if test="${selectedMainEntry.key == sessionScope.queIndex}"> 		
+													  		<c:forEach var="selectedSubEntry" items="${selectedMainEntry.value}">
+
+																<c:if test="${subEntry.key == selectedSubEntry.key}"> 		
+									  							
+																	<tr> 
+																		<td align=left class="input" valign=top> 
+																			<input type="checkbox" 
+																			name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>
+																			onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; 
+																			document.forms[0].questionIndex.value=<c:out value="${sessionScope.queIndex}"/>; 
+																			document.forms[0].optionIndex.value=<c:out value="${subEntry.key}"/>;
+																			if (this.checked == 1)
+																			{
+																				document.forms[0].checked.value=true;
+																			}
+																			else
+																			{
+																				document.forms[0].checked.value=false;
+																			}
+																			document.forms[0].submit();" CHECKED> 
+																		</td> 
+																		<td align=left class="input" valign=top> 
+																			<c:out value="${subEntry.value}"/>
+																		</td>
+																	</tr>	
+												  		  	 		<c:set var="checkedOptionFound" scope="request" value="1"/>
+				  												</c:if> 			
+
+														</c:forEach>																						
+	  												</c:if> 			
+												</c:forEach>									
+												<!-- till  here --> 									  					
+
+												<c:if test="${requestScope.checkedOptionFound == 0}"> 		
+																	<tr> 
+																		<td align=left class="input" valign=top> 
+																			<input type="checkbox" 
+																			name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>
+																			onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; 
+																			document.forms[0].questionIndex.value=<c:out value="${sessionScope.queIndex}"/>; 
+																			document.forms[0].optionIndex.value=<c:out value="${subEntry.key}"/>;
+																			if (this.checked == 1)
+																			{
+																				document.forms[0].checked.value=true;
+																			}
+																			else
+																			{
+																				document.forms[0].checked.value=false;
+																			}
+																			document.forms[0].submit();"> 
+																		</td> 
+																		<td align=left class="input" valign=top> 
+																			<c:out value="${subEntry.value}"/>
+																		</td>
+																	</tr>	
+  												</c:if> 			
+
 											</c:forEach>
 										</c:if> 			
 								</c:forEach>
Index: lams_tool_lamc/web/SequentialAnswersContent.jsp
===================================================================
diff -u -r8bb8d77a378de6ee1231195294e2b078248598c9 -r78aa75a621d7da163d86f6148a2666bc27eddea3
--- lams_tool_lamc/web/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 8bb8d77a378de6ee1231195294e2b078248598c9)
+++ lams_tool_lamc/web/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 78aa75a621d7da163d86f6148a2666bc27eddea3)
@@ -29,7 +29,7 @@
 					  </tr>
 					</c:if> 			
 
-			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
+			 		<c:if test="${sessionScope.isRetries == 'true' && sessionScope.passMark > 0}"> 		
 					  <tr>
 					  	<td align=left class="input" valign=top colspan=2> 
 						  	<font size=2> <b>  <bean:message key="label.learner.message"/> (<c:out value="${sessionScope.passMark}"/><bean:message key="label.percent"/> )