Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
===================================================================
diff -u -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12 -r23b73e96556d74828d16d651138657e2c4a0e635
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java	(.../LearningController.java)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java	(.../LearningController.java)	(revision 23b73e96556d74828d16d651138657e2c4a0e635)
@@ -553,7 +553,7 @@
 	    dacoService.updateEntry(entry);
 	}
 
-	return "pages/learning/finish";
+	return finish(request);
     }
 
     // *************************************************************************************
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -r23b73e96556d74828d16d651138657e2c4a0e635
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 23b73e96556d74828d16d651138657e2c4a0e635)
@@ -40,8 +40,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.daco.DacoConstants;
@@ -467,7 +465,8 @@
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    protected ActionForward getQuestionSummaries(ActionMapping mapping, HttpServletRequest request) {
+    @RequestMapping("/getQuestionSummaries")
+    protected String getQuestionSummaries(HttpServletRequest request) {
 	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 
@@ -493,7 +492,7 @@
 	}
 
 	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return mapping.findForward(DacoConstants.SUCCESS);
+	return "pages/monitoring/questionSummaries";
     }
 
     /**
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/form/RecordForm.java
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r23b73e96556d74828d16d651138657e2c4a0e635
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/form/RecordForm.java	(.../RecordForm.java)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/form/RecordForm.java	(.../RecordForm.java)	(revision 23b73e96556d74828d16d651138657e2c4a0e635)
@@ -108,4 +108,11 @@
     public int getFileCount() {
 	return file.size();
     }
+    public List<String> getAnswer() {
+	return answer;
+    }
+
+    public void setAnswer(List<String> answer) {
+	this.answer = answer;
+    }
 }
\ No newline at end of file