Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
diff -u -r7d9590c15a0ee3175f63dec067d4b5191a8a6e4d -ra5ed179d80f07ee8130b5e3364700180ddc3c6f2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision 7d9590c15a0ee3175f63dec067d4b5191a8a6e4d)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision a5ed179d80f07ee8130b5e3364700180ddc3c6f2)
@@ -25,6 +25,7 @@
 label.redo.questions					=Redo Questions
 label.view.summary						=View Summary
 label.view.answers						=View Answers
+label.finished							=Finished
 
 
 button.basic							=Basic
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r59fe1db88f298509908caae77a8ddfd6fb7d2292 -ra5ed179d80f07ee8130b5e3364700180ddc3c6f2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 59fe1db88f298509908caae77a8ddfd6fb7d2292)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision a5ed179d80f07ee8130b5e3364700180ddc3c6f2)
@@ -2227,6 +2227,13 @@
     		mcLearningForm.resetCommands();
     		return (mapping.findForward(VIEW_SUMMARY));
     	}
+    	else if (mcLearningForm.getLearnerFinished() != null)
+    	{
+    		logger.debug("requested learner finished, the learner should be directed to next activity.");
+    		mcLearningForm.resetCommands();
+    		//fix this
+    		return (mapping.findForward(VIEW_SUMMARY));
+    	}
 
     	mcLearningForm.resetCommands();	
  		return (mapping.findForward(LOAD_LEARNER));
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
===================================================================
diff -u -rb6978e19e4e5ab95fdd7ab3f353f34be5cefa2e6 -ra5ed179d80f07ee8130b5e3364700180ddc3c6f2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	(.../McLearningForm.java)	(revision b6978e19e4e5ab95fdd7ab3f353f34be5cefa2e6)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	(.../McLearningForm.java)	(revision a5ed179d80f07ee8130b5e3364700180ddc3c6f2)
@@ -22,6 +22,7 @@
 	protected String redoQuestions;
 	protected String viewSummary;
 	protected String viewAnswers;
+	protected String learnerFinished;
 	protected String redoQuestionsOk;
 	
 	public void resetCommands()
@@ -33,7 +34,7 @@
 		this.setViewSummary(null);
 		this.setViewAnswers(null);
 		this.setRedoQuestionsOk(null);
-		
+		this.setLearnerFinished(null);
 	}
 
 	public void resetParameters()
@@ -191,4 +192,16 @@
 	public void setNextOptions(String nextOptions) {
 		this.nextOptions = nextOptions;
 	}
+	/**
+	 * @return Returns the learnerFinished.
+	 */
+	public String getLearnerFinished() {
+		return learnerFinished;
+	}
+	/**
+	 * @param learnerFinished The learnerFinished to set.
+	 */
+	public void setLearnerFinished(String learnerFinished) {
+		this.learnerFinished = learnerFinished;
+	}
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -r59fe1db88f298509908caae77a8ddfd6fb7d2292 -ra5ed179d80f07ee8130b5e3364700180ddc3c6f2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 59fe1db88f298509908caae77a8ddfd6fb7d2292)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision a5ed179d80f07ee8130b5e3364700180ddc3c6f2)
@@ -224,6 +224,16 @@
     	request.getSession().setAttribute(TOTAL_QUESTION_COUNT, new Long(mapQuestionsContent.size()).toString());
     	
     	
+    	
+    	request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
+		logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX));
+		logger.debug("final Options Map for the first question: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT));
+		
+		/*also prepare data into mapGeneralOptionsContent for combined answers view */
+		Map mapGeneralOptionsContent=AuthoringUtil.generateGeneralOptionsContentMap(request, mcContent);
+		logger.debug("returned mapGeneralOptionsContent: " + mapGeneralOptionsContent);
+		request.getSession().setAttribute(MAP_GENERAL_OPTIONS_CONTENT, mapGeneralOptionsContent);
+    	
     	/*
 	     * Verify that userId does not already exist in the db.
 	     * If it does exist, that means, that user already responded to the content and 
@@ -235,23 +245,20 @@
 	    McQueUsr mcQueUsr=mcService.retrieveMcQueUsr(new Long(userID));
 	    logger.debug("mcQueUsr:" + mcQueUsr);
 	    
+	    Long queUsrId=mcQueUsr.getUid();
+		logger.debug("queUsrId: " + queUsrId);
+		
+		int learnerBestMark=LearningUtil.getHighestMark(request, queUsrId);
+		logger.debug("learnerBestMark: " + learnerBestMark);
+		request.getSession().setAttribute(LEARNER_BEST_MARK,new Integer(learnerBestMark).toString());
+	    
 	    if (mcQueUsr != null)
 	    {
 	    	logger.debug("the learner has already responsed to this content, just generate a read-only report. Use redo questions for this.");
 	    	return (mapping.findForward(REDO_QUESTIONS));
 	    }
 	    
-	    
-	    request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
-		logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX));
-		logger.debug("final Options Map for the first question: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT));
-		
-		/*also prepare data into mapGeneralOptionsContent for combined answers view */
-		Map mapGeneralOptionsContent=AuthoringUtil.generateGeneralOptionsContentMap(request, mcContent);
-		logger.debug("returned mapGeneralOptionsContent: " + mapGeneralOptionsContent);
-		request.getSession().setAttribute(MAP_GENERAL_OPTIONS_CONTENT, mapGeneralOptionsContent);
-		
-		return (mapping.findForward(LOAD_LEARNER));	
+	    return (mapping.findForward(LOAD_LEARNER));	
 	}
 	
 	
Index: lams_tool_lamc/web/IndividualLearnerResults.jsp
===================================================================
diff -u -r7d9590c15a0ee3175f63dec067d4b5191a8a6e4d -ra5ed179d80f07ee8130b5e3364700180ddc3c6f2
--- lams_tool_lamc/web/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 7d9590c15a0ee3175f63dec067d4b5191a8a6e4d)
+++ lams_tool_lamc/web/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision a5ed179d80f07ee8130b5e3364700180ddc3c6f2)
@@ -176,13 +176,20 @@
 			  	   </tr>
 
 			  	   
+
 			 		<c:if test="${sessionScope.isRetries == 'true'}"> 					  	   
 		  	   		  <tr>
 					  	<td colspan=2 align=center class="input" valign=top> 
 				  			<html:submit property="redoQuestions" styleClass="a.button">
 								<bean:message key="label.redo.questions"/>
 							</html:submit>	 		
-	   						&nbsp&nbsp&nbsp&nbsp&nbsp
+		       
+							<c:if test="${sessionScope.userPassed == 'true'}">
+						  	   <html:submit property="learnerFinished" styleClass="a.button">
+									<bean:message key="label.finished"/>
+							   </html:submit>
+					  	   </c:if>
+
 	   						<html:submit property="viewSummary" styleClass="a.button">
 								<bean:message key="label.view.summary"/>
 							</html:submit>	 				 		  					
@@ -192,7 +199,13 @@
 
 					<c:if test="${sessionScope.isRetries != 'true'}"> 							  
 		  	   		  <tr>
-					  	<td colspan=2 align=right class="input" valign=top> 
+		  	   		    <td colspan=2 align=right class="input" valign=top>
+			  	   		  	<c:if test="${sessionScope.userPassed == 'true'}">
+						  	   <html:submit property="learnerFinished" styleClass="a.button">
+											<bean:message key="label.finished"/>
+							   </html:submit>
+				  	   		</c:if>
+
 	   						<html:submit property="viewSummary" styleClass="a.button">
 								<bean:message key="label.view.summary"/>
 							</html:submit>	 				 		  					
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rb6978e19e4e5ab95fdd7ab3f353f34be5cefa2e6 -ra5ed179d80f07ee8130b5e3364700180ddc3c6f2
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision b6978e19e4e5ab95fdd7ab3f353f34be5cefa2e6)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision a5ed179d80f07ee8130b5e3364700180ddc3c6f2)
@@ -109,6 +109,12 @@
 		    path=".answers"
 		    redirect="true"
 	  	/>
+
+	  	<forward
+		    name="redoQuestions"
+		    path=".redoQuestions"
+		    redirect="true"
+	  	/>
 	  	
 	  	<forward
 		    name="errorList"