Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r20bf078c4c6b3b81a32229b940ef836371ff098c -r336dd0a5a85e5ddc5c2b46f7a3388b31903a51c9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 20bf078c4c6b3b81a32229b940ef836371ff098c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 336dd0a5a85e5ddc5c2b46f7a3388b31903a51c9)
@@ -79,13 +79,18 @@
 		IMcService mcService = (IMcService)request.getSession().getAttribute(TOOL_SERVICE);
 		logger.debug("will retrieve mcService"  + mcService);
 		
-		Boolean isDefineLaterUrl =(Boolean)request.getAttribute(IS_DEFINE_LATER_URL);
-		logger.debug("isDefineLaterUrl in request"  + isDefineLaterUrl);
+		String activeModule=(String) request.getSession().getAttribute(ACTIVE_MODULE);
+		logger.debug("activeModule: "  + activeModule);
 		
-		if ((isDefineLaterUrl != null) && (isDefineLaterUrl.booleanValue() == true))
-			request.getSession().setAttribute(IS_DEFINE_LATER_URL, new Boolean(true));
-		else
-			request.getSession().setAttribute(IS_DEFINE_LATER_URL, new Boolean(false));
+		if ( (activeModule == null) || 
+			 (!activeModule.equals(DEFINE_LATER))
+			)
+		{
+			request.getSession().setAttribute(ACTIVE_MODULE, AUTHORING);
+			logger.debug("activeModule set to Authoring: "  + activeModule);
+			//request.getSession().setAttribute(IS_DEFINE_LATER_URL, new Boolean(true));
+		}
+		logger.debug("final active activeModule is: "  + request.getSession().getAttribute(ACTIVE_MODULE));
 		
 		if (mcService == null)
 		{
@@ -516,6 +521,9 @@
 		IMcService mcService =McUtils.getToolService(request);
 		request.getSession().setAttribute(IS_REVISITING_USER, new Boolean(false));
 		
+		request.getSession().setAttribute(DEFINE_LATER_EDIT_ACTIVITY, new Boolean(false));
+		logger.debug("setting DEFINE_LATER_EDIT_ACTIVITY to false.");
+		
 		long contentId=0;
 		logger.debug("getting default content");
 		contentId=mcService.getToolDefaultContentIdBySignature(MY_SIGNATURE);
@@ -700,9 +708,13 @@
 		throws IOException, ServletException, McApplicationException {
 		logger.debug("passed mcService: " + mcService);
 		request.getSession().setAttribute(TOOL_SERVICE, mcService);
+
+		//to indicate that Edit button is enabled in the define later screen
+		request.getSession().setAttribute(DEFINE_LATER_EDIT_ACTIVITY, new Boolean(true));
 		
-		request.getSession().setAttribute(IS_DEFINE_LATER_URL, new Boolean(true));
-		request.setAttribute(IS_DEFINE_LATER_URL,new Boolean(true));
+		request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER);
+		//present the view-only screen first
+		request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(false));
 		return execute(mapping, form, request, response);
 	}