Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r09ef6f966a98b137bb8388349d8feee0fcf23216
--- tool_adapters/moodle/lams_tool_mdlchoice/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 09ef6f966a98b137bb8388349d8feee0fcf23216)
@@ -41,5 +41,5 @@
 label.save  =Save
 label.cancel  =Cancel
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
-
+learner.choice.output  =Which choice the learner selects (number)
 #======= End labels =====
Index: tool_adapters/moodle/lams_tool_mdlchoice/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r09ef6f966a98b137bb8388349d8feee0fcf23216
--- tool_adapters/moodle/lams_tool_mdlchoice/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 09ef6f966a98b137bb8388349d8feee0fcf23216)
@@ -41,5 +41,6 @@
 label.save  =Save
 label.cancel  =Cancel
 error.defineLater  =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity.
+learner.choice.output  =Which choice the learner selects (number)
 
 #======= End labels =====
Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AuthoringAction.java
===================================================================
diff -u -r416e2087ef866a7d0ebc58e3d7e307a65ced335f -r09ef6f966a98b137bb8388349d8feee0fcf23216
--- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 416e2087ef866a7d0ebc58e3d7e307a65ced335f)
+++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 09ef6f966a98b137bb8388349d8feee0fcf23216)
@@ -147,13 +147,8 @@
 	    //String courseUrlToBeUsed = (mdlChoice.getExtCourseUrl() != null) ? mdlChoice.getExtCourseUrl() : courseUrlFromCSV;
 
 	   String responseUrl = mdlChoiceService.getConfigItem(MdlChoiceConfigItem.KEY_EXTERNAL_SERVER_URL)
-		    .getConfigValue();
-	   /* responseUrl += RELATIVE_MOODLE_AUTHOR_URL;
-	    String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&"
-		    + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8");
-	    responseUrl += "&lamsUpdateURL=" + returnUpdateUrl;*/
+		    .getConfigValue();		
 		
-		
 		 responseUrl += RELATIVE_MOODLE_AUTHOR_URL;
 		    String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&"
 			    + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8");
Index: tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/LearningAction.java
===================================================================
diff -u -r1aa9c97818704a7585e91c03e8b3a17314e05482 -r09ef6f966a98b137bb8388349d8feee0fcf23216
--- tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 1aa9c97818704a7585e91c03e8b3a17314e05482)
+++ tool_adapters/moodle/lams_tool_mdlchoice/src/java/org/lamsfoundation/lams/tool/mdchce/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 09ef6f966a98b137bb8388349d8feee0fcf23216)
@@ -98,6 +98,7 @@
 	}
 
 	MdlChoice mdlChoice = mdlChoiceSession.getMdlChoice();
+	MdlChoiceUser mdlChoiceUser = getCurrentUser(toolSessionID);
 
 	// check defineLater
 	if (mdlChoice.isDefineLater()) {
@@ -127,7 +128,7 @@
 				{
 					responseUrl += RELATIVE_TEACHER_URL;
 				}
-				else if (mode.equals(ToolAccessMode.LEARNER))
+				else if (mode.equals(ToolAccessMode.LEARNER)|| mode.equals(ToolAccessMode.AUTHOR))
 				{
 					responseUrl += RELATIVE_LEARNER_URL;
 				}
@@ -141,7 +142,7 @@
 		
 
 		responseUrl += "&id=" + mdlChoiceSession.getExtSessionId() + "&returnUrl=" + returnUrl
-			+ "&dest=" + encodedMoodleRelativePath + "&is_learner=1";
+			+ "&dest=" + encodedMoodleRelativePath + "&is_learner=1" + "&isFinished=" + mdlChoiceUser.isFinishedActivity();
 		
 		
 		log.debug("Redirecting for mdl choice learner: " + responseUrl);