Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -re6d1e7b2b7a185ef297334af35e9aec398a29930
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision e6d1e7b2b7a185ef297334af35e9aec398a29930)
@@ -79,6 +79,7 @@
     public static final String EDIT_OPTS_CONTENT						="editOptsContent";
     public static final String ADD_OPTS_CONTENT							="addOptsContent";
     public static final String REMOVE_OPTS_CONTENT						="removeOptsContent";
+    public static final String USER_ACTION								="userAction";
     
     
     public static final String AUTHORING_BASIC							="authoringBasic";
@@ -105,8 +106,10 @@
     /**
      * authoring mode constants
      */
-    public static final String MAP_QUESTION_CONTENT						="mapQuestionContent";
+    public static final String MAP_QUESTIONS_CONTENT					="mapQuestionsContent";
     public static final String MAP_OPTIONS_CONTENT						="mapOptionsContent";
+    
+    public static final String MAP_QUESTION_CONTENT						="mapQuestionContent";
     public static final String DEFAULT_QUESTION_CONTENT					="defaultQuestionContent";
     public static final String TITLE									="title";
     public static final String INSTRUCTIONS								="instructions";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
diff -u -r562680abb2d5566e7972f1ee4a1993fbbebc4ca9 -re6d1e7b2b7a185ef297334af35e9aec398a29930
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 562680abb2d5566e7972f1ee4a1993fbbebc4ca9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision e6d1e7b2b7a185ef297334af35e9aec398a29930)
@@ -175,9 +175,8 @@
 		{		
 			mcAuthoringForm.setTitle(defaultMcContent.getTitle());
 			mcAuthoringForm.setInstructions(defaultMcContent.getInstructions());
-			
-			request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,defaultMcContent.getOfflineInstructions());
-		    request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,defaultMcContent.getOnlineInstructions());
+			mcAuthoringForm.setOfflineInstructions (defaultMcContent.getOfflineInstructions());
+			mcAuthoringForm.setOnlineInstructions (defaultMcContent.getOnlineInstructions());
 		}
 	}
 	
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -re6d1e7b2b7a185ef297334af35e9aec398a29930
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision e6d1e7b2b7a185ef297334af35e9aec398a29930)
@@ -213,12 +213,22 @@
 	 	
 	 	logger.debug("mcAuthoringForm.getEditDefaultQuestion():" + mcAuthoringForm.getEditDefaultQuestion());
 	 	String userAction=null;
-	 	if (mcAuthoringForm.getEditDefaultQuestion() != null)
+	 	
+	 	if (mcAuthoringForm.getAddQuestion() != null)
 	 	{
+	 		userAction="addQuestion";
+	 		request.setAttribute(USER_ACTION, userAction);
+	 		return (mapping.findForward(LOAD_QUESTIONS));
+	 	}
+	 	else if (mcAuthoringForm.getEditDefaultQuestion() != null)
+	 	{
 	 		userAction="editDefaultQuestion";
+	 		request.setAttribute(USER_ACTION, userAction);
 	 		return (mapping.findForward(EDIT_OPTS_CONTENT));
-	 		
 	 	}
+	 	
+	 	
+	 	
 	 	logger.debug("userAction:" + userAction);
 
 	 	IMcService mcService =McUtils.getToolService(request);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -re6d1e7b2b7a185ef297334af35e9aec398a29930
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision e6d1e7b2b7a185ef297334af35e9aec398a29930)
@@ -25,6 +25,7 @@
 	protected String editDefaultQuestion;
 	protected String addOptionContent;	
 	protected String removeOptionContent;
+	protected String addQuestion;
 	
 	protected String addContent;
 	protected String removeContent;
@@ -77,6 +78,7 @@
 		this.editDefaultQuestion=null;
 		this.addOptionContent=null;	
 		this.removeOptionContent=null;
+		this.addQuestion=null;
 		
     	this.addContent=null;	
     	this.removeContent=null;
@@ -98,6 +100,7 @@
 		this.editDefaultQuestion=null;
 		this.addOptionContent=null;	
 		this.removeOptionContent=null;
+		this.addQuestion=null;
 		
 		this.addContent=null;
 		this.removeContent=null;
@@ -583,4 +586,16 @@
 	public void setRemoveOptionContent(String removeOptionContent) {
 		this.removeOptionContent = removeOptionContent;
 	}
+	/**
+	 * @return Returns the addQuestion.
+	 */
+	public String getAddQuestion() {
+		return addQuestion;
+	}
+	/**
+	 * @param addQuestion The addQuestion to set.
+	 */
+	public void setAddQuestion(String addQuestion) {
+		this.addQuestion = addQuestion;
+	}
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r562680abb2d5566e7972f1ee4a1993fbbebc4ca9 -re6d1e7b2b7a185ef297334af35e9aec398a29930
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 562680abb2d5566e7972f1ee4a1993fbbebc4ca9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision e6d1e7b2b7a185ef297334af35e9aec398a29930)
@@ -105,7 +105,7 @@
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
   								throws IOException, ServletException, McApplicationException {
 	
-		Map mapQuestionContent= new TreeMap(new McComparator());
+		Map mapQuestionsContent= new TreeMap(new McComparator());
 		Map mapOptionsContent= new TreeMap(new McComparator());
 		
 		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
@@ -192,10 +192,6 @@
 				persistError(request,"error.defaultQuestionContent.notAvailable");
 				return (mapping.findForward(LOAD_QUESTIONS));
 			}
-			/**
-        	 * display a single sample question
-        	 */
-    		request.getSession().setAttribute(DEFAULT_QUESTION_CONTENT, mcQueContent.getQuestion());
 		}
 		catch(Exception e)
 		{
@@ -287,6 +283,14 @@
 				persistError(request,"error.defaultQuestionContent.notAvailable");
 				return (mapping.findForward(LOAD_QUESTIONS));
 			}
+			/**
+        	 * display a single sample question
+        	 */
+    		request.getSession().setAttribute(DEFAULT_QUESTION_CONTENT, mcQueContent.getQuestion());
+    		mapQuestionsContent.put(new Long(1).toString(), mcQueContent.getQuestion());
+    		request.getSession().setAttribute(MAP_QUESTIONS_CONTENT, mapQuestionsContent);
+    		logger.debug("starter initialized the Questions Map: " + request.getSession().getAttribute("mapQuestionsContent") );
+    		
 			
 			/** hold all he options for this question*/
 			List list=mcService.findMcOptionsContentByQueId(mcQueContent.getUid());
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -re6d1e7b2b7a185ef297334af35e9aec398a29930
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision e6d1e7b2b7a185ef297334af35e9aec398a29930)
@@ -119,29 +119,50 @@
 							</td>
 						</tr>
 				
-			 		<!--default question content, this entry can not be deleted but can be updated -->
-				 		<tr> 
-						  	<td> 
-						 		<bean:message key="label.question1"/> : 
-						 	</td>
-						  	<td>
-								  	<input type="text" name="questionContent0" size="50" 
-								  	maxlength="255" value="<c:out value="${sessionScope.defaultQuestionContent}"/>"> 
-								  	&nbsp
-									<html:submit property="addContent" styleClass="linkbutton" 
-									onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-										<bean:message key="button.addNewQuestion"/>
-									</html:submit>
-						  	</td>
-						  	<td>						  	
-						  			<html:submit property="editDefaultQuestion" styleClass="linkbutton"  
-			 						onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-										<bean:message key="button.editQuestion"/>
-									</html:submit>
-						  	</td>									
-					  	</tr>
+
+			  	 		<c:set var="queIndex" scope="session" value="1"/>
+						<c:forEach var="questionEntry" items="${sessionScope.mapQuestionsContent}">
+							  <c:if test="${questionEntry.key == 1}"> 			
+								  <tr>
+								  	<td> <c:out value="Question ${queIndex}"/> : </td>
+								  		<td> 
+								  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"   
+									  		size="50" maxlength="255"> 
+									  	</td>
+									  	<td> 
+									  		ADD
+									  	</td>
+									  	<td> 
+									  		EDIT
+									  	</td>
+									  	
+								  </tr>
+							</c:if> 			
+					  		<c:if test="${questionEntry.key > 1}"> 			
+								<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+								  <tr>
+								  	<td> <c:out value="Question ${queIndex}"/> : </td>
+								  		<td> 
+								  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"   
+									  		size="50" maxlength="255"> 
+									  	</td>
+									  	<td> 
+									  		EDIT
+									  	</td>
+									  	
+										<td>									  										  		
+			 								<html:submit property="removeContent" styleClass="linkbutton"  onclick="removeQuestion(${queIndex});"
+			 								onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
+												<bean:message key="button.removeQuestion"/>
+											</html:submit>
+									  	</td>
+								  </tr>
+							</c:if> 			
+						</c:forEach>
+							<html:hidden property="questionIndex"/>
+
 	 				</table> 	 
-					<html:hidden property="questionIndex"/>
+					
 </div>
 <hr>
 <a href="javascript:;" class="button">Cancel</a>
@@ -185,9 +206,14 @@
 	function editQuestion(questionIndex)
 	{
 		document.forms[0].questionIndex.value=questionIndex;
-		document.forms[0].isEditQuestion.value='1';
 		document.forms[0].submit();
 	}
+	
+	function removeQuestion(questionIndex)
+	{
+		document.forms[0].questionIndex.value=questionIndex;
+		document.forms[0].submit();
+	}
  </SCRIPT>