Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/GeneralLearnerFlowDTO.java,v
diff -u -r1.17.4.1 -r1.17.4.1.4.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	11 May 2009 04:36:36 -0000	1.17.4.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	1 Nov 2010 10:24:09 -0000	1.17.4.1.4.1
@@ -93,10 +93,8 @@
 
     protected Map mapQuestions;
 
-    protected Map mapFeedback;
+    protected Map<String,QaQuestionContentDTO> mapQuestionContentLearner;
 
-    protected Map mapQuestionContentLearner;
-
     protected List listMonitoredAnswersContainerDTO;
 
     protected String currentMonitoredToolSession;
@@ -163,15 +161,15 @@
     /**
      * @return Returns the mapQuestionContentLearner.
      */
-    public Map getMapQuestionContentLearner() {
+    public Map<String,QaQuestionContentDTO> getMapQuestionContentLearner() {
 	return mapQuestionContentLearner;
     }
 
     /**
      * @param mapQuestionContentLearner
      *                The mapQuestionContentLearner to set.
      */
-    public void setMapQuestionContentLearner(Map mapQuestionContentLearner) {
+    public void setMapQuestionContentLearner(Map<String,QaQuestionContentDTO> mapQuestionContentLearner) {
 	this.mapQuestionContentLearner = mapQuestionContentLearner;
     }
 
@@ -288,7 +286,7 @@
 			mapAnswers).append("mapQuestions: ", mapQuestions).append("mapQuestionContentLearner: ",
 			mapQuestionContentLearner).append("listMonitoredAnswersContainerDTO: ",
 			listMonitoredAnswersContainerDTO).append("currentMonitoredToolSession: ",
-			currentMonitoredToolSession).append("mapFeedback: ", mapFeedback).toString();
+			currentMonitoredToolSession).toString();
     }
 
     /**
@@ -592,21 +590,6 @@
     }
 
     /**
-     * @return Returns the mapFeedback.
-     */
-    public Map getMapFeedback() {
-	return mapFeedback;
-    }
-
-    /**
-     * @param mapFeedback
-     *                The mapFeedback to set.
-     */
-    public void setMapFeedback(Map mapFeedback) {
-	this.mapFeedback = mapFeedback;
-    }
-
-    /**
      * @return Returns the teacherViewOnly.
      */
     public String getTeacherViewOnly() {
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.24.8.1 -r1.24.8.1.4.1
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	11 May 2009 04:36:36 -0000	1.24.8.1
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	1 Nov 2010 10:24:25 -0000	1.24.8.1.4.1
@@ -44,13 +44,17 @@
 			<p>
 			 <strong><fmt:message key="label.question" /> <c:out
 					value="${questionEntry.key}" />:</strong>
+					<c:if test="${questionEntry.value.required}">
+						<fmt:message key="label.required" />
+					</c:if>
+					<c:out value="${questionEntry.value.question}" escapeXml="false" />
 					</p>
 				
 				 
-					<c:out value="${questionEntry.value}" escapeXml="false" />
 					  <p><strong><fmt:message key="label.answer" /></strong>
 					</p>
-					
+
+										
 					<c:choose>
 						<c:when test="${generalLearnerFlowDTO.allowRichEditor}">
 							<lams:FCKEditor id="answer${questionEntry.key}" value="${answerEntry.value}"
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.33.8.2 -r1.33.8.3
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	16 Sep 2009 08:21:22 -0000	1.33.8.2
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	1 Nov 2010 10:24:25 -0000	1.33.8.3
@@ -89,7 +89,7 @@
 						<strong><fmt:message key="label.question" /> <c:out
 								value="${questionEntry.key}" />:</strong>
 						<br>
-						<c:out value="${questionEntry.value}" escapeXml="false" />
+						<c:out value="${questionEntry.value.question}" escapeXml="false" />
 					</p>
 
 					<c:forEach var="answerEntry"
@@ -112,21 +112,12 @@
 					</c:forEach>
 
 
-					<c:forEach var="feedbackEntry"
-						items="${generalLearnerFlowDTO.mapFeedback}">
-						<c:if
-							test="${(feedbackEntry.value != '') && (feedbackEntry.value != null) }">
-							<c:if test="${feedbackEntry.key == questionEntry.key}">
+					<c:if test="${(questionEntry.value.feedback != '') && (questionEntry.value.feedback != null) }">
+							<span class="field-name"> <fmt:message
+									key="label.feedback" />: </span>
+							<c:out value="${questionEntry.value.feedback}" escapeXml="false" />
+					</c:if>
 
-								<span class="field-name"> <fmt:message
-										key="label.feedback" />: </span>
-
-								<c:out value="${feedbackEntry.value}" escapeXml="false" />
-
-							</c:if>
-						</c:if>
-					</c:forEach>
-
 				</div>
 
 			</c:forEach>
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v
diff -u -r1.22.8.1 -r1.22.8.1.4.1
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	11 May 2009 04:36:36 -0000	1.22.8.1
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	1 Nov 2010 10:24:25 -0000	1.22.8.1.4.1
@@ -45,8 +45,11 @@
 			<p>
 				<strong><fmt:message key="label.question" /> <c:out
 						value="${questionEntry.key}" />:</strong>
-				<br>
-				<c:out value="${questionEntry.value}" escapeXml="false" />
+				<c:if test="${questionEntry.value.required}">
+					<fmt:message key="label.required" />
+				</c:if>
+			<br>
+				<c:out value="${questionEntry.value.question}" escapeXml="false" />
 			</p>
 
 			<p>