Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r8a81c117f2bb66e5e4c7e5be0f2ca4bb8a1db7de -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 8a81c117f2bb66e5e4c7e5be0f2ca4bb8a1db7de)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -64,6 +64,7 @@
     public static final String EDIT_OPTIONS_MODE						="editOptionsMode";
     public static final String DEFINE_LATER_IN_EDIT_MODE				="defineLaterInEditMode";
     public static final String SUBMIT_SUCCESS							="sbmtSuccess";
+    public static final String QUESTION_INDEX							="questionIndex";
     
     /*
      * authoring mode controllers
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
===================================================================
diff -u -re49068e45839612d025d20b33368c7ca21346a6f -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	(.../McGeneralLearnerFlowDTO.java)	(revision e49068e45839612d025d20b33368c7ca21346a6f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	(.../McGeneralLearnerFlowDTO.java)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -85,9 +85,52 @@
     protected Map mapQuestionsContent;
     
     protected String toolSessionId;
+    
+    protected String totalCountReached;
+    
+    protected String questionIndex;
+    
+    protected String questionListingMode;
+    
 
         
     /**
+     * @return Returns the questionListingMode.
+     */
+    public String getQuestionListingMode() {
+        return questionListingMode;
+    }
+    /**
+     * @param questionListingMode The questionListingMode to set.
+     */
+    public void setQuestionListingMode(String questionListingMode) {
+        this.questionListingMode = questionListingMode;
+    }
+    /**
+     * @return Returns the questionIndex.
+     */
+    public String getQuestionIndex() {
+        return questionIndex;
+    }
+    /**
+     * @param questionIndex The questionIndex to set.
+     */
+    public void setQuestionIndex(String questionIndex) {
+        this.questionIndex = questionIndex;
+    }
+    /**
+     * @return Returns the totalCountReached.
+     */
+    public String getTotalCountReached() {
+        return totalCountReached;
+    }
+    /**
+     * @param totalCountReached The totalCountReached to set.
+     */
+    public void setTotalCountReached(String totalCountReached) {
+        this.totalCountReached = totalCountReached;
+    }
+    /**
      * @return Returns the toolSessionId.
      */
     public String getToolSessionId() {
@@ -292,6 +335,7 @@
             .append("reportTitleLearner: ", reportTitleLearner)
             .append("activityInstructions: ", activityInstructions)
             .append("activityTitle: ", activityTitle)
+            .append("questionListingMode: ", questionListingMode)
             .toString();
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
===================================================================
diff -u -re49068e45839612d025d20b33368c7ca21346a6f -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	(.../LearningUtil.java)	(revision e49068e45839612d025d20b33368c7ca21346a6f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	(.../LearningUtil.java)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -671,6 +671,12 @@
         mcGeneralLearnerFlowDTO.setPassMark(mcContent.getPassMark().toString());
         mcGeneralLearnerFlowDTO.setReportTitleLearner(mcContent.getReportTitle());
         
+        if (mcContent.isQuestionsSequenced()) 
+            mcGeneralLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_SEQUENTIAL);
+        else
+            mcGeneralLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
+            
+        
         logger.debug("continue buildMcGeneralLearnerFlowDTO: " + mcContent);
         mcGeneralLearnerFlowDTO.setTotalQuestionCount(new Integer(mcContent.getMcQueContents().size()).toString());
         logger.debug("final mcGeneralLearnerFlowDTO: " + mcGeneralLearnerFlowDTO);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -re49068e45839612d025d20b33368c7ca21346a6f -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision e49068e45839612d025d20b33368c7ca21346a6f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -259,10 +259,21 @@
     	McLearningForm mcLearningForm = (McLearningForm) form;
 	 	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 	 	
-    	mcLearningForm.resetParameters();
-    	String toolContentId=mcLearningForm.getToolContentId();
+	 	String toolContentId=mcLearningForm.getToolContentId();
     	logger.debug("toolContentId: " + toolContentId);
     	
+    	logger.debug("mcLearningForm nextQuestionSelected : " + mcLearningForm.getNextQuestionSelected());
+    	
+	 	if ((mcLearningForm.getNextQuestionSelected() != null) && 
+	 	    (!mcLearningForm.getNextQuestionSelected().equals(""))) 
+	 	{
+	 	   logger.debug("presenting next question...");
+	 	   mcLearningForm.resetParameters();
+	   	   setContentInUse(request, toolContentId, mcService);
+	 	   return getNextOptions(mapping, form, request, response);
+	 	}
+	 	    	
+    	
     	if (mcLearningForm.getContinueOptionsCombined() != null)
     	{
     		setContentInUse(request, toolContentId, mcService);
@@ -379,8 +390,6 @@
     			logger.debug("updated user records to finished");
         	}
 
-    	    
-    		
     		/* pay attention here*/
     		logger.debug("redirecting to the nextUrl: "+ nextUrl);
     		response.sendRedirect(nextUrl);
@@ -620,6 +629,7 @@
     	
     	McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
     	logger.debug("constructed a new mcGeneralLearnerFlowDTO");
+    	mcGeneralLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
     	
     	int totalQuestionCount=mcContent.getMcQueContents().size();
     	logger.debug("totalQuestionCount: " + totalQuestionCount);
@@ -780,26 +790,39 @@
 		McLearningForm mcLearningForm = (McLearningForm) form;
 		IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());		
 	 	
-		String currentQuestionIndex=(String)request.getSession().getAttribute(CURRENT_QUESTION_INDEX);
-    	logger.debug("currentQuestionIndex:" + currentQuestionIndex);
+ 	    String questionIndex=mcLearningForm.getQuestionIndex();
+ 	    logger.debug("questionIndex: " + questionIndex);
+
+	 	String toolContentId=mcLearningForm.getToolContentId();
+	 	logger.debug("toolContentId: " + toolContentId);
+
+    	McContent mcContent=mcService.retrieveMc(new Long(toolContentId));
+    	logger.debug("mcContent: " + mcContent);
     	
-    	String totalQuestionCount=(String)request.getSession().getAttribute(TOTAL_QUESTION_COUNT);
-    	logger.debug("totalQuestionCount:" + totalQuestionCount);
+    	List listQuestionAndCandidateAnswersDTO=LearningUtil.buildQuestionAndCandidateAnswersDTO(request, mcContent, mcService);
+		logger.debug("listQuestionAndCandidateAnswersDTO: " + listQuestionAndCandidateAnswersDTO);
+		request.setAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO, listQuestionAndCandidateAnswersDTO);
+		logger.debug("LIST_QUESTION_CANDIDATEANSWERS_DTO: " +  request.getAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO));
+
+    	McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
+
+		String totalQuestionCount=mcGeneralLearnerFlowDTO.getTotalQuestionCount();
+		logger.debug("totalQuestionCount: " + totalQuestionCount);
     	
     	int intTotalQuestionCount=new Integer(totalQuestionCount).intValue();
-    	int intCurrentQuestionIndex=new Integer(currentQuestionIndex).intValue();
+    	int intQuestionIndex=new Integer(questionIndex).intValue();
     	
-    	if (intTotalQuestionCount-1 == intCurrentQuestionIndex)
+    	logger.debug("intTotalQuestionCount versus intCurrentQuestionIndex: " + intTotalQuestionCount + " versus " + intQuestionIndex);
+    	if (intTotalQuestionCount == intQuestionIndex)
     	{
     			logger.debug("totalQuestionCount has been reached :" + totalQuestionCount);
-        		request.getSession().setAttribute(TOTAL_COUNT_REACHED, new Boolean(true).toString());
+    			mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(true).toString());
        	}
     		
    		mcLearningForm.resetCommands();
    
-       	int newQuestionIndex=new Integer(currentQuestionIndex).intValue() + 1;
-       	request.getSession().setAttribute(CURRENT_QUESTION_INDEX, new Integer(newQuestionIndex).toString());
-       	logger.debug("updated questionIndex:" + request.getSession().getAttribute(CURRENT_QUESTION_INDEX));
+       	mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(questionIndex).toString());
+       	request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 
        	return (mapping.findForward(LOAD_LEARNER));
     }
@@ -833,13 +856,19 @@
 
     	McContent mcContent=mcService.retrieveMc(new Long(toolContentId));
     	logger.debug("mcContent: " + mcContent);
-		
-		
+    	
+    	List listQuestionAndCandidateAnswersDTO=LearningUtil.buildQuestionAndCandidateAnswersDTO(request, mcContent, mcService);
+		logger.debug("listQuestionAndCandidateAnswersDTO: " + listQuestionAndCandidateAnswersDTO);
+		request.setAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO, listQuestionAndCandidateAnswersDTO);
+		logger.debug("LIST_QUESTION_CANDIDATEANSWERS_DTO: " +  request.getAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO));
+
 		McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
- 		
-		request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
-		request.getSession().setAttribute(TOTAL_COUNT_REACHED, new Boolean(false).toString());
+		mcGeneralLearnerFlowDTO.setCurrentQuestionIndex(new Integer(1).toString());
+		mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(false).toString());
 		
+		//request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
+		//request.getSession().setAttribute(TOTAL_COUNT_REACHED, new Boolean(false).toString());
+		
 		String toolSessionId=mcLearningForm.getToolSessionId();
 		logger.debug("toolSessionId: " + toolSessionId);
     	
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
===================================================================
diff -u -re49068e45839612d025d20b33368c7ca21346a6f -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	(.../McLearningForm.java)	(revision e49068e45839612d025d20b33368c7ca21346a6f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	(.../McLearningForm.java)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -34,8 +34,7 @@
  * ActionForm for the Learning environment
  */
 public class McLearningForm extends ActionForm implements McAppConstants {
-
-    protected String continueOptions;
+	protected String continueOptions;
 	protected String nextOptions;
 	protected String continueOptionsCombined;
 	protected String redoQuestions;
@@ -59,8 +58,13 @@
 	protected String passMarkApplicable;
     protected String learnerProgress;
     protected String learnerProgressUserId;
+    
+    protected String questionListingMode;
+
+    protected String questionIndex;
+    protected String nextQuestionSelected;
     	
- 	public void resetCa(ActionMapping mapping, HttpServletRequest request) {
+    public void resetCa(ActionMapping mapping, HttpServletRequest request) {
  	   checkedCa = new String[0];
 	}
 
@@ -81,6 +85,7 @@
 
 	public void resetParameters()
 	{
+	    this.setNextQuestionSelected(null);
 	}
 
 
@@ -331,4 +336,45 @@
     public void setLearnerProgressUserId(String learnerProgressUserId) {
         this.learnerProgressUserId = learnerProgressUserId;
     }
+    
+    /**
+     * @return Returns the nextQuestionSelected.
+     */
+    public String getNextQuestionSelected() {
+        return nextQuestionSelected;
+    }
+    /**
+     * @param nextQuestionSelected The nextQuestionSelected to set.
+     */
+    public void setNextQuestionSelected(String nextQuestionSelected) {
+        this.nextQuestionSelected = nextQuestionSelected;
+    }
+    
+    /**
+     * @return Returns the questionIndex.
+     */
+    public String getQuestionIndex() {
+        return questionIndex;
+    }
+    /**
+     * @param questionIndex The questionIndex to set.
+     */
+    public void setQuestionIndex(String questionIndex) {
+        this.questionIndex = questionIndex;
+    }
+    
+    /**
+     * @return Returns the questionListingMode.
+     */
+    public String getQuestionListingMode() {
+        return questionListingMode;
+    }
+    /**
+     * @param questionListingMode The questionListingMode to set.
+     */
+    public void setQuestionListingMode(String questionListingMode) {
+        this.questionListingMode = questionListingMode;
+    }
+    
+
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -re49068e45839612d025d20b33368c7ca21346a6f -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision e49068e45839612d025d20b33368c7ca21346a6f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -237,7 +237,6 @@
 	    	McUtils.cleanUpSessionAbsolute(request);
 	    	logger.debug("error: The tool expects mcContent.");
 	    	persistError(request,"error.content.doesNotExist");
-	    	//request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DOESNOTEXIST, new Boolean(true).toString());
 	    	return (mapping.findForward(ERROR_LIST));
 	    }
 
@@ -247,10 +246,14 @@
 	     * And the passed tool session id already refers to it.
 	     */
 	    setupAttributes(request, mcContent, mcLearnerStarterDTO);
+	    request.setAttribute(MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
 	    
 	    mcLearningForm.setToolContentId(mcContent.getMcContentId().toString());
 	    mcLearningForm.setToolContentUID(mcContent.getUid().toString());
 	    
+	    commonContentSetup(request, mcContent, mcService);
+	    
+	    
     	/* Is the request for a preview by the author?
     	Preview The tool must be able to show the specified content as if it was running in a lesson. 
 		It will be the learner url with tool access mode set to ToolAccessMode.AUTHOR 
@@ -262,26 +265,15 @@
     	/* ? CHECK THIS: how do we determine whether preview is requested? Mode is not enough on its own.*/
 	    
 	    /*handle PREVIEW mode*/
-	    //String mode=(String) request.getSession().getAttribute(LEARNING_MODE);
 	    String mode=mcLearningForm.getLearningMode();
 	    
 	    logger.debug("mode: " + mode);
     	if ((mode != null) && (mode.equals("author")))
     	{
     		logger.debug("Author requests for a preview of the content.");
 			logger.debug("existing mcContent:" + mcContent);
-    		
-			commonContentSetup(request, mcContent, mcService);
-    		
-	    	/*only allowing combined view in the preview mode. Might be improved to support sequential view as well. */
-	    	mcLearnerStarterDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
-	    	/* PREVIEW_ONLY for jsp*/
 
-	    	
-	    	request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
-    		McLearningAction mcLearningAction= new McLearningAction();
-	    	//return mcLearningAction.redoQuestions(request, mcLearningForm, mapping);
-    		/*presenting the teacher with a view of how students normally take the activity*/
+	    	/* PREVIEW_ONLY for jsp*/
     		return (mapping.findForward(LOAD_LEARNER));
     	}
 	    
@@ -293,7 +285,6 @@
 		if ((userId != null) && (mode.equals("teacher")))
 		{
 			logger.debug("request is for learner progress");
-			commonContentSetup(request, mcContent, mcService);
 	    	
 			/* LEARNER_PROGRESS for jsp*/
 			mcLearningForm.setLearnerProgress(new Boolean(true).toString());
@@ -309,7 +300,6 @@
 		    {
 		    	McUtils.cleanUpSessionAbsolute(request);
 		    	persistError(request, "error.learner.required");
-		    	//request.getSession().setAttribute(USER_EXCEPTION_LEARNER_REQUIRED, new Boolean(true).toString());
 				return (mapping.findForward(ERROR_LIST));
 		    }
 		    
@@ -324,7 +314,6 @@
 				 (mcSessionLocal.getMcSessionId().longValue() != toolSessionId.longValue()))
 		    {
 		    	McUtils.cleanUpSessionAbsolute(request);
-		    	//request.getSession().setAttribute(USER_EXCEPTION_TOOLSESSIONID_INCONSISTENT, new Boolean(true).toString());
 		    	persistError(request, "error.learner.sessionId.inconsistent");
 				return (mapping.findForward(ERROR_LIST));
 		    }
@@ -354,22 +343,6 @@
 	    	return (mapping.findForward(DEFINE_LATER));
 	    }
 
-	    /*
-    	 * fetch question content from content
-    	 */
-    	
-		List listQuestionAndCandidateAnswersDTO=LearningUtil.buildQuestionAndCandidateAnswersDTO(request, mcContent, mcService);
-		logger.debug("listQuestionAndCandidateAnswersDTO: " + listQuestionAndCandidateAnswersDTO);
-		request.setAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO, listQuestionAndCandidateAnswersDTO);
-		logger.debug("LIST_QUESTION_CANDIDATEANSWERS_DTO: " +  request.getAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO));
-		
-		McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
-		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
-		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
-
-    	request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
-		logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX));
-		
 		/*also prepare data into mapGeneralOptionsContent for combined answers view */
     	
     	/*
@@ -479,11 +452,14 @@
 		logger.debug("LIST_QUESTION_CANDIDATEANSWERS_DTO: " +  request.getAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO));
 		
 		McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
+		mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(false).toString());
+		mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(1).toString());
+
 		request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
 		logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
 		
-		request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
-		logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX));
+		//request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
+		//logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX));
 	}
 	
 	
Index: lams_tool_lamc/web/images/green_arrow_down_right.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r54049b70be0d86d212cf2cee1e27bca3b97ea59f -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 54049b70be0d86d212cf2cee1e27bca3b97ea59f)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -36,23 +36,35 @@
 	<html:base />
 	<lams:headItems />
 	<title><bean:message key="activity.title" /></title>
+	
+		<script language="JavaScript" type="text/JavaScript">
+			function submitNextQuestionSelected() 
+			{
+				alert(document.McLearningForm.questionIndex.value)
+				++document.McLearningForm.questionIndex.value;
+				alert(document.McLearningForm.questionIndex.value)
+				document.McLearningForm.nextQuestionSelected.value = 1;
+				document.McLearningForm.submit();
+			}
+		</script>
 </head>
 
 <body>
 	<div id="page-learner">
 	
 	<h1 class="no-tabs-below">
-		<c:out value="${mcLearnerStarterDTO.activityTitle}" escapeXml="false" />
+		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
 	</h1>
 
 <div id="header-no-tabs-learner"></div>
 
 <div id="content-learner">
-	<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
+	<html:form  action="/learning?method=displayMc&validate=false" enctype="multipart/form-data" method="POST" target="_self">
 		<html:hidden property="toolContentId"/>						
-		<html:hidden property="toolSessionId"/>								
+		<html:hidden property="toolSessionId"/>						
+
 		<c:choose> 
-		  <c:when test="${mcLearnerStarterDTO.questionListingMode == 'questionListingModeSequential'}" > 
+		  <c:when test="${mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}" > 
 				<jsp:include page="/learning/SingleQuestionAnswersContent.jsp" /> 
 		  </c:when> 
 		  <c:otherwise>
Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r8a81c117f2bb66e5e4c7e5be0f2ca4bb8a1db7de -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 8a81c117f2bb66e5e4c7e5be0f2ca4bb8a1db7de)
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -64,7 +64,8 @@
 			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}"> 		
 					  <tr>
 					  	<td NOWRAP align=left valign=top colspan=2> 
-						  	 <b>  <bean:message key="label.learner.message"/> (<c:out value="${mcGeneralLearnerFlowDTO.passMark}"/><bean:message key="label.percent"/> )  </b>
+						  	 <b>  <bean:message key="label.learner.message"/> (<c:out value="${mcGeneralLearnerFlowDTO.passMark}"/>
+						  	 <bean:message key="label.percent"/> )  </b>
 					  	</td>
 					  </tr>
 					</c:if>
Index: lams_tool_lamc/web/learning/Copy of SingleQuestionAnswersContent.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/learning/Copy of SingleQuestionAnswersContent.jsp	(revision 0)
+++ lams_tool_lamc/web/learning/Copy of SingleQuestionAnswersContent.jsp	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -0,0 +1,199 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+	<!--options content goes here-->
+				<table class="forms">
+					  <tr>
+					  	<th scope="col" valign=top colspan=2> 
+						  	  <bean:message key="label.assessment"/> 
+					  	</th>
+					  </tr>
+					  
+					  <tr>
+					  	<td NOWRAP align=left valign=top colspan=2> 
+						  	<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" /> 
+					  	</td>
+					  </tr>
+
+
+			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 		
+					  <tr>
+					  	<td NOWRAP align=center valign=top colspan=2> 
+						  	 <b> <bean:message key="label.withRetries"/> </b>
+					  	</td>
+					  </tr>
+					</c:if> 			
+				
+					<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 		
+					  <tr>
+					  	<td NOWRAP align=center  valign=top colspan=2> 
+						  	<b> <bean:message key="label.withoutRetries"/> </b>
+					  	</td>
+					  </tr>
+					</c:if> 			
+
+			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}"> 		
+					  <tr>
+					  	<td NOWRAP align=left valign=top colspan=2> 
+						  	  <bean:message key="label.learner.message"/>
+						  		 (<c:out value="${mcGeneralLearnerFlowDTO.passMark}"/><bean:message key="label.percent"/> ) 
+					  	</td>
+					  </tr>
+					</c:if> 								  
+				
+  		  	 		<c:set var="mainQueIndex" scope="session" value="0"/>
+					<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
+					<c:set var="mainQueIndex" scope="session" value="${mainQueIndex +1}"/>
+					
+			  		<c:if test="${questionEntry.key == sessionScope.currentQuestionIndex}"> 			
+					
+						  <tr>
+						  	<td NOWRAP align=left valign=top colspan=2> 
+								  		<c:out value="${questionEntry.value}"/> 
+						  	</td>
+						  </tr>
+
+						  <tr>						 
+							<td NOWRAP align=left>
+							<table align=left>
+			  		  	 		<c:set var="queIndex" scope="session" value="0"/>
+								<c:forEach var="mainEntry" items="${sessionScope.mapGeneralOptionsContent}">
+									<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+										<c:if test="${sessionScope.mainQueIndex == sessionScope.queIndex}"> 		
+									  		<c:forEach var="subEntry" items="${mainEntry.value}">
+									  		
+							  		  	 		<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 NOWRAP align=left 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}"/>;
+																				document.forms[0].optionValue.value='<c:out value="${subEntry.value}"/>';
+																				
+																				if (this.checked == 1)
+																				{
+																					document.forms[0].checked.value=true;
+																				}
+																				else
+																				{
+																					document.forms[0].checked.value=false;
+																				}
+																				document.forms[0].submit();" CHECKED> 
+																		</td> 
+																		<td NOWRAP align=left 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 NOWRAP align=left 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}"/>;
+																				document.forms[0].optionValue.value='<c:out value="${subEntry.value}"/>';																			
+	
+																				if (this.checked == 1)
+																				{
+																					document.forms[0].checked.value=true;
+																				}
+																				else
+																				{
+																					document.forms[0].checked.value=false;
+																				}
+																				document.forms[0].submit();"> 
+																		</td> 
+																		<td NOWRAP align=left valign=top> 
+																			 <c:out value="${subEntry.value}"/> 
+																		</td>
+																	</tr>	
+  												</c:if> 			
+
+											</c:forEach>
+										</c:if> 			
+								</c:forEach>
+							</table>
+							</td>
+						</tr>
+						</c:if> 				
+					</c:forEach>
+
+			  	   	<tr> 
+				  	   	<html:hidden property="optionCheckBoxSelected"/>
+						<html:hidden property="questionIndex"/>
+						<html:hidden property="optionIndex"/>
+						<html:hidden property="optionValue"/>						
+						<html:hidden property="checked"/>
+				 		<td colspan=2 valign=top> 
+				 		&nbsp
+				 		</td>
+			  	   </tr>
+
+
+		  		<c:if test="${sessionScope.totalCountReached != 'true'  &&  sessionScope.totalQuestionCount != '1'}"> 			
+	  	   		  <tr>
+				  	<td NOWRAP colspan=2 valign=top> 
+				  			<html:submit property="nextOptions" styleClass="button">
+								<bean:message key="button.nextQuestion"/>
+							</html:submit>	 				 		  					
+				  	 </td>
+				  </tr>
+				</c:if> 								  
+
+		 		<c:if test="${sessionScope.totalQuestionCount == '1'}"> 		
+	  	   		  <tr>
+				  	<td NOWRAP colspan=2 valign=top> 
+				  			<html:submit property="continueOptionsCombined" styleClass="button">
+								<bean:message key="button.continue"/>
+							</html:submit>	 				 		  					
+				  	 </td>
+				  </tr>
+				</c:if> 								  
+				
+		 		<c:if test="${sessionScope.totalCountReached == 'true'}"> 		
+	  	   		  <tr>
+				  	<td NOWRAP colspan=2 valign=top> 
+				  			<html:submit property="continueOptionsCombined" styleClass="button">
+								<bean:message key="button.continue"/>
+							</html:submit>	 				 		  					
+				  	 </td>
+				  </tr>
+				</c:if> 								  
+			</table>
+	<!--options content ends here-->
+
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
diff -u -rf5d829f5762c9d23b05f7cde82c488ed37b9be58 -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision f5d829f5762c9d23b05f7cde82c488ed37b9be58)
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision 6ce3706b391e6c79a50eb0180c14e2ee4535fff5)
@@ -18,164 +18,109 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
 	<!--options content goes here-->
 				<table class="forms">
 					  <tr>
 					  	<th scope="col" valign=top colspan=2> 
-						  	  <bean:message key="label.assessment"/> 
-					  	</th>
+						  	 <bean:message key="label.assessment"/> 
+					  	</td>
 					  </tr>
 					  
 					  <tr>
 					  	<td NOWRAP align=left valign=top colspan=2> 
-						  	<c:out value="${activityInstructions}" escapeXml="false" /> 
+						  	<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" /> 
 					  	</td>
 					  </tr>
-
-
-			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
+					  
+			
+			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 		
 					  <tr>
 					  	<td NOWRAP align=center valign=top colspan=2> 
-						  	 <b> <bean:message key="label.withRetries"/> </b>
+						  	  <b> <bean:message key="label.withRetries"/> </b>
 					  	</td>
 					  </tr>
 					</c:if> 			
 				
-					<c:if test="${sessionScope.isRetries != 'true'}"> 		
+					<c:if test="${mcGeneralLearnerFlowDTO.retries == 'false'}"> 		
 					  <tr>
-					  	<td NOWRAP align=center  valign=top colspan=2> 
-						  	<b> <bean:message key="label.withoutRetries"/> </b>
+					  	<td NOWRAP align=center valign=top colspan=2> 
+						    <b> <bean:message key="label.withoutRetries"/> </b>
 					  	</td>
 					  </tr>
 					</c:if> 			
 
-			 		<c:if test="${sessionScope.isRetries == 'true' && sessionScope.passMark > 0}"> 		
+			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}"> 		
 					  <tr>
 					  	<td NOWRAP align=left valign=top colspan=2> 
-						  	  <bean:message key="label.learner.message"/>
-						  		 (<c:out value="${sessionScope.passMark}"/><bean:message key="label.percent"/> ) 
+						  	 <b>  <bean:message key="label.learner.message"/> (<c:out value="${mcGeneralLearnerFlowDTO.passMark}"/>
+						  	 <bean:message key="label.percent"/> )  </b>
 					  	</td>
 					  </tr>
-					</c:if> 								  
-				
-  		  	 		<c:set var="mainQueIndex" scope="session" value="0"/>
-					<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
-					<c:set var="mainQueIndex" scope="session" value="${mainQueIndex +1}"/>
-					
-			  		<c:if test="${questionEntry.key == sessionScope.currentQuestionIndex  &&  sessionScope.questionListingMode == sessionScope.questionListingModeSequential}"> 			
-					
-						  <tr>
-						  	<td NOWRAP align=left valign=top colspan=2> 
-								  		<c:out value="${questionEntry.value}"/> 
-						  	</td>
-						  </tr>
+					</c:if>
 
-						  <tr>						 
-							<td NOWRAP align=left>
-							<table align=left>
-			  		  	 		<c:set var="queIndex" scope="session" value="0"/>
-								<c:forEach var="mainEntry" items="${sessionScope.mapGeneralOptionsContent}">
-									<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-										<c:if test="${sessionScope.mainQueIndex == sessionScope.queIndex}"> 		
-									  		<c:forEach var="subEntry" items="${mainEntry.value}">
-									  		
-							  		  	 		<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 NOWRAP align=left 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}"/>;
-																				document.forms[0].optionValue.value='<c:out value="${subEntry.value}"/>';
-																				
-																				if (this.checked == 1)
-																				{
-																					document.forms[0].checked.value=true;
-																				}
-																				else
-																				{
-																					document.forms[0].checked.value=false;
-																				}
-																				document.forms[0].submit();" CHECKED> 
-																		</td> 
-																		<td NOWRAP align=left 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 NOWRAP align=left 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}"/>;
-																				document.forms[0].optionValue.value='<c:out value="${subEntry.value}"/>';																			
-	
-																				if (this.checked == 1)
-																				{
-																					document.forms[0].checked.value=true;
-																				}
-																				else
-																				{
-																					document.forms[0].checked.value=false;
-																				}
-																				document.forms[0].submit();"> 
-																		</td> 
-																		<td NOWRAP align=left valign=top> 
-																			 <c:out value="${subEntry.value}"/> 
-																		</td>
-																	</tr>	
-  												</c:if> 			
-
+				  <tr>						 
+					  	<td NOWRAP align=left valign=top colspan=2> 
+						<table align=left>
+						
+								<html:hidden property="nextQuestionSelected"/>						
+								<html:hidden property="questionIndex" value="${mcGeneralLearnerFlowDTO.questionIndex}"/>						
+								<c:forEach var="dto" varStatus="status" items="${requestScope.listQuestionCandidateAnswersDto}">
+									<c:if test="${dto.displayOrder == mcGeneralLearnerFlowDTO.questionIndex}"> 										
+									  <tr>
+									  	<td NOWRAP align=left valign=top> 
+										  		<c:out value="${dto.question}"/> &nbsp[ <b> <bean:message key="label.weight"/> : </b>
+										  		<c:out value="${dto.weight}"/> ]
+									  	</td>
+									  </tr>
+									
+									  <tr>
+									  	<td NOWRAP align=left valign=top> 
+											<c:forEach var="ca" varStatus="status" items="${dto.candidateAnswerUids}">
+												<input type="checkbox" name="checkedCa" value="${dto.questionUid}-${ca.value}"> 
+													
+													<c:forEach var="caText" varStatus="status" items="${dto.candidateAnswers}">
+														<c:if test="${ca.key == caText.key}"> 		
+																<c:out value="${caText.value}" escapeXml="false"/><BR>
+														</c:if>															
+													</c:forEach>
 											</c:forEach>
-										</c:if> 			
-								</c:forEach>
-							</table>
-							</td>
-						</tr>
-						</c:if> 				
-					</c:forEach>
+									  	</td>
+									  </tr>
+									</c:if>																								  
+								</c:forEach>								
+						</table>
+						</td>
+					</tr>
 
+
 			  	   	<tr> 
-				  	   	<html:hidden property="optionCheckBoxSelected"/>
-						<html:hidden property="questionIndex"/>
-						<html:hidden property="optionIndex"/>
-						<html:hidden property="optionValue"/>						
-						<html:hidden property="checked"/>
-				 		<td colspan=2 valign=top> 
+				 		<td NOWRAP colspan=2 valign=top> 
 				 		&nbsp
 				 		</td>
 			  	   </tr>
-
-
-		  		<c:if test="${sessionScope.totalCountReached != 'true'  &&  sessionScope.totalQuestionCount != '1'}"> 			
+			  	   
+			  	<html:hidden property="donePreview"/>						   
+		  		<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}"> 			
 	  	   		  <tr>
 				  	<td NOWRAP colspan=2 valign=top> 
-				  			<html:submit property="nextOptions" styleClass="button">
-								<bean:message key="button.nextQuestion"/>
-							</html:submit>	 				 		  					
+						  <img src="<c:out value="${tool}"/>images/green_arrow_down_right.gif" align=left onclick="javascript:submitNextQuestionSelected();"> 							
 				  	 </td>
 				  </tr>
 				</c:if> 								  
 
-		 		<c:if test="${sessionScope.totalQuestionCount == '1'}"> 		
+		 		<c:if test="${mcGeneralLearnerFlowDTO.totalQuestionCount == '1'}"> 		
 	  	   		  <tr>
 				  	<td NOWRAP colspan=2 valign=top> 
 				  			<html:submit property="continueOptionsCombined" styleClass="button">
@@ -185,7 +130,7 @@
 				  </tr>
 				</c:if> 								  
 				
-		 		<c:if test="${sessionScope.totalCountReached == 'true'}"> 		
+		 		<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}"> 		
 	  	   		  <tr>
 				  	<td NOWRAP colspan=2 valign=top> 
 				  			<html:submit property="continueOptionsCombined" styleClass="button">
@@ -194,6 +139,6 @@
 				  	 </td>
 				  </tr>
 				</c:if> 								  
-			</table>
+		</table>
 	<!--options content ends here-->