Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
diff -u -r95a8036ef190595474c3bac650ecd8e004434fd2 -r8348d2289e46f1a2a5363868765c7844946f7874
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision 95a8036ef190595474c3bac650ecd8e004434fd2)
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision 8348d2289e46f1a2a5363868765c7844946f7874)
@@ -39,6 +39,7 @@
    allow_overall_feedback tinyint,
    allow_right_wrong_answers tinyint,
    allow_grades_after_attempt tinyint,
+   allow_history_responses tinyint,
    questions_per_page integer DEFAULT 0,
    shuffled tinyint,
    attempt_completion_notify tinyint DEFAULT 0,
@@ -93,7 +94,7 @@
    uid bigint not null unique auto_increment,
    question_uid bigint,
    sequence_id integer,
-   multiplier integer,
+   multiplier float,
    unit varchar(255),
    primary key (uid)
 )type=innodb;
@@ -168,7 +169,7 @@
 
 INSERT INTO `tl_laasse10_assessment` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, 
  `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_question_feedback`, 
- `allow_overall_feedback`, `allow_right_wrong_answers`, `allow_grades_after_attempt`, `shuffled`) VALUES
-  (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0);
+ `allow_overall_feedback`, `allow_right_wrong_answers`, `allow_grades_after_attempt`, `allow_history_responses`, `shuffled`) VALUES
+  (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0);
 
 SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
===================================================================
diff -u -r95a8036ef190595474c3bac650ecd8e004434fd2 -r8348d2289e46f1a2a5363868765c7844946f7874
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	(.../Assessment.hbm.xml)	(revision 95a8036ef190595474c3bac650ecd8e004434fd2)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	(.../Assessment.hbm.xml)	(revision 8348d2289e46f1a2a5363868765c7844946f7874)
@@ -216,6 +216,14 @@
         />
 
         <property
+            name="allowHistoryResponses"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_history_responses"
+        />
+
+        <property
             name="questionsPerPage"
             type="int"
             update="true"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r95a8036ef190595474c3bac650ecd8e004434fd2 -r8348d2289e46f1a2a5363868765c7844946f7874
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 95a8036ef190595474c3bac650ecd8e004434fd2)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 8348d2289e46f1a2a5363868765c7844946f7874)
@@ -79,6 +79,8 @@
     
     private boolean allowGradesAfterAttempt;
     
+    private boolean allowHistoryResponses;
+    
     private boolean defineLater;
 
     private boolean contentInUse;
@@ -556,6 +558,18 @@
     }
     
     /**
+     * @hibernate.property column="allow_history_responses"
+     * @return
+     */
+    public boolean isAllowHistoryResponses() {
+	return allowHistoryResponses;
+    }
+
+    public void setAllowHistoryResponses(boolean allowHistoryResponses) {
+	this.allowHistoryResponses = allowHistoryResponses;
+    }
+    
+    /**
      * @hibernate.property column="questions_per_page"
      * @return
      */
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r3dab7c956ec906f70368dfeb1fafde8e720a473c -r8348d2289e46f1a2a5363868765c7844946f7874
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3dab7c956ec906f70368dfeb1fafde8e720a473c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8348d2289e46f1a2a5363868765c7844946f7874)
@@ -624,8 +624,12 @@
 	request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);
 	
 	List<AssessmentUnit> unitList = new ArrayList<AssessmentUnit>();
-	for (int i = 0; i < AssessmentConstants.INITIAL_UNITS_NUMBER; i++) {
-	    AssessmentUnit unit = new AssessmentUnit();
+	AssessmentUnit unit = new AssessmentUnit();
+	unit.setSequenceId(1);
+	unit.setMultiplier(1);
+	unitList.add(unit);	
+	for (int i = 1; i < AssessmentConstants.INITIAL_UNITS_NUMBER; i++) {
+	    unit = new AssessmentUnit();
 	    unit.setSequenceId(i+1);
 	    unit.setMultiplier(0);
 	    unitList.add(unit);
@@ -1377,15 +1381,11 @@
 	    String sequenceId = paramMap.get(AssessmentConstants.ATTR_UNIT_SEQUENCE_ID_PREFIX + i);	    
 	    unit.setSequenceId(NumberUtils.stringToInt(sequenceId));
 	    unit.setUnit(unitStr);
-	    String multiplierStr = (String) paramMap.get(AssessmentConstants.ATTR_UNIT_MULTIPLIER_PREFIX + i);
-	    if (isForSaving && !StringUtils.isBlank(multiplierStr)) {
-		float multiplier = Float.valueOf(multiplierStr);
-		unit.setMultiplier(multiplier);
-	    } else {
-		unit.setMultiplierStr(multiplierStr);
-	    }	    
+	    float multiplier = Float.valueOf(paramMap.get(AssessmentConstants.ATTR_UNIT_MULTIPLIER_PREFIX + i));
+	    unit.setMultiplier(multiplier);
 	    unitList.add(unit);
 	}
+	
 	return unitList;
     }
     
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -r8348d2289e46f1a2a5363868765c7844946f7874
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 8348d2289e46f1a2a5363868765c7844946f7874)
@@ -80,6 +80,14 @@
 </p>
 
 <p>
+	<html:checkbox property="assessment.allowHistoryResponses" styleClass="noBorder" styleId="allowHistoryResponsesAfterAttempt">
+	</html:checkbox>
+	<label for="allowHistoryResponsesAfterAttempt">
+		<fmt:message key="label.authoring.advance.allow.students.history.responses" />
+	</label>
+</p>
+
+<p>
 	<html:checkbox property="assessment.notifyTeachersOnAttemptCompletion"
 		styleClass="noBorder" styleId="notifyTeachersOnAttemptCompletion">
 	</html:checkbox>
Index: lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp
===================================================================
diff -u -r988d9fce322beaf579b828d5694f2260bbc17b51 -r8348d2289e46f1a2a5363868765c7844946f7874
--- lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp	(.../unitlist.jsp)	(revision 988d9fce322beaf579b828d5694f2260bbc17b51)
+++ lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp	(.../unitlist.jsp)	(revision 8348d2289e46f1a2a5363868765c7844946f7874)
@@ -32,12 +32,12 @@
 							<td style="padding-left:0px; border-bottom:0px; background:none;">	
 							<c:choose>
 								<c:when test="${status.index == 0}">
-									<input type="hidden" name="unitMultiplier0" id="unitMultiplier0" value="1">
-									1
+									<input type="hidden" name="unitMultiplier0" id="unitMultiplier0" value="${unit.multiplier}">
+									${unit.multiplier}
 								</c:when>
 								<c:otherwise>
 									<input type="text" name="unitMultiplier${status.index}"
-										id="unitMultiplier${status.index}" size="20" value="${unit.multiplierStr}" class="number" title="<fmt:message key='label.authoring.choice.enter.float'/>">
+										id="unitMultiplier${status.index}" size="20" value="${unit.multiplier}" class="number" title="<fmt:message key='label.authoring.choice.enter.float'/>">
 								</c:otherwise>
 							</c:choose>							
 							</td>