Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -896,7 +896,7 @@
 label.create.question  =Create question
 label.question.type.multiple.choice  =Multiple choice
 label.question.type.matching.pairs  =Matching pairs
-label.question.type.short.answer  =Short answer
+label.question.type.short.answer  =Very short answers
 label.question.type.numerical  =Numerical
 label.question.type.true.false  =True/False
 label.question.type.essay  =Essay
@@ -954,6 +954,7 @@
 label.authoring.basic.general.feedback  =General feedback
 label.authoring.basic.shuffle.the.choices  =Shuffle answers?
 label.ask.for.hedging.justification  =Ask for hedging justification?
+label.autocomplete.as.student  =Autocomplete (as student types answer autocomplete with stemming from answers)
 label.authoring.basic.penalty.factor  =Penalty factor
 error.form.validation.hundred.score  =One of the answers should have a grade of 100% so it is possible to get full marks for this question.
 error.form.validation.positive.accepted.errors  =All the accepted errors should be positive.
@@ -968,7 +969,7 @@
 label.authoring.true.false.true  =True
 label.authoring.basic.type.multiple.choice  =Multiple choice
 label.authoring.basic.type.matching.pairs  =Matching pairs
-label.authoring.basic.type.short.answer  =Short answer
+label.authoring.basic.type.short.answer  =Very short answers
 label.authoring.basic.type.numerical  =Numerical
 label.authoring.basic.type.true.false  =True/False
 label.authoring.basic.type.essay  =Essay
@@ -978,5 +979,6 @@
 label.authoring.basic.option.answer  =Answer
 label.authoring.basic.delete  =Delete
 label.authoring.basic.none  =None
+error.positive.grade.required  =One of the answers should have a positive grade
 
 #======= End labels: Exported 872 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
===================================================================
diff -u -rf0b909d0e482fe674e3c3d2f40ec7cc8d19b6803 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision f0b909d0e482fe674e3c3d2f40ec7cc8d19b6803)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Date;
@@ -15,6 +16,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
@@ -106,7 +108,7 @@
      */
     @RequestMapping("/editQuestion")
     public String editQuestion(@ModelAttribute("assessmentQuestionForm") QbQuestionForm form,
-	    HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	    HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, IllegalAccessException, InvocationTargetException {
 	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
 	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
 	if (qbQuestion == null) {
@@ -136,10 +138,12 @@
 	form.setMaxWordsLimit(qbQuestion.getMaxWordsLimit());
 	form.setMinWordsLimit(qbQuestion.getMinWordsLimit());
 	form.setHedgingJustificationEnabled(qbQuestion.isHedgingJustificationEnabled());
+	//TODO check autocomplete is saved and then maybe remove other property copying
+	BeanUtils.copyProperties(form, qbQuestion);
 
 	Integer questionType = qbQuestion.getType();
 	if ((questionType == QbQuestion.TYPE_MULTIPLE_CHOICE) || (questionType == QbQuestion.TYPE_ORDERING)
-		|| (questionType == QbQuestion.TYPE_MATCHING_PAIRS) || (questionType == QbQuestion.TYPE_SHORT_ANSWER)
+		|| (questionType == QbQuestion.TYPE_MATCHING_PAIRS) || (questionType == QbQuestion.TYPE_VERY_SHORT_ANSWERS)
 		|| (questionType == QbQuestion.TYPE_NUMERICAL) || (questionType == QbQuestion.TYPE_MARK_HEDGING)) {
 	    List<QbOption> optionList = qbQuestion.getQbOptions();
 	    request.setAttribute(QbConstants.ATTR_OPTION_LIST, optionList);
@@ -267,8 +271,8 @@
 	// without eviction changes would be saved immediately into DB
 	qbService.releaseFromCache(oldQuestion);
 
-	qbQuestion.setName(form.getTitle());
-	qbQuestion.setDescription(form.getDescription());
+	qbQuestion.setName(form.getTitle().strip());
+	qbQuestion.setDescription(form.getDescription().strip());
 
 	if (!form.isAuthoringRestricted()) {
 	    qbQuestion.setMaxMark(form.getMaxMark());
@@ -290,27 +294,35 @@
 	    qbQuestion.setFeedbackOnCorrect(form.getFeedbackOnCorrect());
 	    qbQuestion.setFeedbackOnPartiallyCorrect(form.getFeedbackOnPartiallyCorrect());
 	    qbQuestion.setFeedbackOnIncorrect(form.getFeedbackOnIncorrect());
+	    
 	} else if ((type == QbQuestion.TYPE_MATCHING_PAIRS)) {
 	    qbQuestion.setPenaltyFactor(Float.parseFloat(form.getPenaltyFactor()));
 	    qbQuestion.setShuffle(form.isShuffle());
-	} else if ((type == QbQuestion.TYPE_SHORT_ANSWER)) {
+	    
+	} else if ((type == QbQuestion.TYPE_VERY_SHORT_ANSWERS)) {
 	    qbQuestion.setPenaltyFactor(Float.parseFloat(form.getPenaltyFactor()));
 	    qbQuestion.setCaseSensitive(form.isCaseSensitive());
+	    qbQuestion.setAutocompleteEnabled(form.isAutocompleteEnabled());
+	    
 	} else if ((type == QbQuestion.TYPE_NUMERICAL)) {
 	    qbQuestion.setPenaltyFactor(Float.parseFloat(form.getPenaltyFactor()));
+	    
 	} else if ((type == QbQuestion.TYPE_TRUE_FALSE)) {
 	    qbQuestion.setPenaltyFactor(Float.parseFloat(form.getPenaltyFactor()));
 	    qbQuestion.setCorrectAnswer(form.isCorrectAnswer());
 	    qbQuestion.setFeedbackOnCorrect(form.getFeedbackOnCorrect());
 	    qbQuestion.setFeedbackOnIncorrect(form.getFeedbackOnIncorrect());
+	    
 	} else if ((type == QbQuestion.TYPE_ESSAY)) {
 	    qbQuestion.setAllowRichEditor(form.isAllowRichEditor());
 	    qbQuestion.setMaxWordsLimit(form.getMaxWordsLimit());
 	    qbQuestion.setMinWordsLimit(form.getMinWordsLimit());
+	    
 	} else if (type == QbQuestion.TYPE_ORDERING) {
 	    qbQuestion.setPenaltyFactor(Float.parseFloat(form.getPenaltyFactor()));
 	    qbQuestion.setFeedbackOnCorrect(form.getFeedbackOnCorrect());
 	    qbQuestion.setFeedbackOnIncorrect(form.getFeedbackOnIncorrect());
+	    
 	} else if (type == QbQuestion.TYPE_MARK_HEDGING) {
 	    qbQuestion.setShuffle(form.isShuffle());
 	    qbQuestion.setFeedbackOnCorrect(form.getFeedbackOnCorrect());
@@ -321,7 +333,7 @@
 
 	// set options
 	if ((type == QbQuestion.TYPE_MULTIPLE_CHOICE) || (type == QbQuestion.TYPE_ORDERING)
-		|| (type == QbQuestion.TYPE_MATCHING_PAIRS) || (type == QbQuestion.TYPE_SHORT_ANSWER)
+		|| (type == QbQuestion.TYPE_MATCHING_PAIRS) || (type == QbQuestion.TYPE_VERY_SHORT_ANSWERS)
 		|| (type == QbQuestion.TYPE_NUMERICAL) || (type == QbQuestion.TYPE_MARK_HEDGING)) {
 	    Set<QbOption> optionList = getOptionsFromRequest(request, true);
 	    List<QbOption> options = new ArrayList<>();
@@ -428,7 +440,7 @@
 	    }
 	    option.setDisplayOrder(NumberUtils.toInt(displayOrder));
 
-	    if ((questionType == QbQuestion.TYPE_MULTIPLE_CHOICE) || (questionType == QbQuestion.TYPE_SHORT_ANSWER)) {
+	    if ((questionType == QbQuestion.TYPE_MULTIPLE_CHOICE) || (questionType == QbQuestion.TYPE_VERY_SHORT_ANSWERS)) {
 		String name = paramMap.get(QbConstants.ATTR_OPTION_NAME_PREFIX + i);
 		if ((name == null) && isForSaving) {
 		    continue;
@@ -496,6 +508,17 @@
 
 	    optionList.add(option);
 	}
+	
+//	//in case of VSA make sure it has 2 option groups, one of which having 0 maxMark
+//	if (questionType == QbQuestion.TYPE_VERY_SHORT_ANSWERS && optionList.size() == 1) {
+//	    QbOption option = new QbOption();
+//	    option.setDisplayOrder(1);
+//	    option.setName("");
+//	    option.setMaxMark(0);
+//	    option.setFeedback("");
+//	    optionList.add(option);
+//	}
+	
 	return optionList;
     }
 
@@ -578,8 +601,8 @@
 	    case QbQuestion.TYPE_MATCHING_PAIRS:
 		forward = "qb/authoring/addmatchingpairs";
 		break;
-	    case QbQuestion.TYPE_SHORT_ANSWER:
-		forward = "qb/authoring/addshortanswer";
+	    case QbQuestion.TYPE_VERY_SHORT_ANSWERS:
+		forward = "qb/authoring/addVsa";
 		break;
 	    case QbQuestion.TYPE_NUMERICAL:
 		forward = "qb/authoring/addnumerical";
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
===================================================================
diff -u -r7dc409ffd76dcebc2d210a3a128cdcbba171ff33 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java	(.../ImsQtiController.java)	(revision 7dc409ffd76dcebc2d210a3a128cdcbba171ff33)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java	(.../ImsQtiController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -90,7 +90,7 @@
 		    qbQuestion.setPrefixAnswersWithLetters(false);
 
 		} else {
-		    qbQuestion.setType(QbQuestion.TYPE_SHORT_ANSWER);
+		    qbQuestion.setType(QbQuestion.TYPE_VERY_SHORT_ANSWERS);
 		    qbQuestion.setCaseSensitive(false);
 		}
 
@@ -400,7 +400,7 @@
 		    }
 		    break;
 
-		case QbQuestion.TYPE_SHORT_ANSWER:
+		case QbQuestion.TYPE_VERY_SHORT_ANSWERS:
 		    question.setType(Question.QUESTION_TYPE_FILL_IN_BLANK);
 
 		    for (QbOption assessmentAnswer : qbQuestion.getQbOptions()) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
===================================================================
diff -u -r475b1970be027a5c59a08d33ad1aa1f6b2443402 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(.../SearchQBController.java)	(revision 475b1970be027a5c59a08d33ad1aa1f6b2443402)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(.../SearchQBController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -95,7 +95,12 @@
 	StringBuilder questionTypesAvailable = new StringBuilder(); 
 	//by default show MCQ type of questions (except for Q&A tool)
 	int questionTypeDefault = QbQuestion.TYPE_MULTIPLE_CHOICE;
-	if (CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature) || CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
+	if (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
+	   
+	} else if (CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) {
+	    questionTypesAvailable.append(QbQuestion.TYPE_MULTIPLE_CHOICE);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_VERY_SHORT_ANSWERS);
 	    
 	//CommonConstants.TOOL_SIGNATURE_SURVEY
 	} else if ("lasurv11".equals(toolSignature)) {
@@ -108,7 +113,7 @@
 	    questionTypesAvailable.append(",");
 	    questionTypesAvailable.append(QbQuestion.TYPE_MATCHING_PAIRS);
 	    questionTypesAvailable.append(",");
-	    questionTypesAvailable.append(QbQuestion.TYPE_SHORT_ANSWER);
+	    questionTypesAvailable.append(QbQuestion.TYPE_VERY_SHORT_ANSWERS);
 	    questionTypesAvailable.append(",");
 	    questionTypesAvailable.append(QbQuestion.TYPE_NUMERICAL);
 	    questionTypesAvailable.append(",");
@@ -126,6 +131,8 @@
 	}
 	request.setAttribute("questionType", questionTypeDefault);
 	request.setAttribute("questionTypesAvailable", questionTypesAvailable.toString());
+	//let jsp know it's Scratchie, so we can disable VSA questions not compatible with TBL
+	request.setAttribute("isScratchie", CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature));
 	
 	//prepare data for displaying collections
 	Integer userId = getUserId();
@@ -207,6 +214,11 @@
 	QbQuestion qbQuestion = (QbQuestion) userManagementService.findById(QbQuestion.class, questionUid);
 	request.setAttribute("question", qbQuestion);
 	
+	boolean isVsaAndCompatibleWithTbl = qbQuestion.isVsaAndCompatibleWithTbl();
+	request.setAttribute("isVsaAndCompatibleWithTbl", isVsaAndCompatibleWithTbl);
+	boolean isScratchie = WebUtil.readBooleanParam(request, "isScratchie", false);
+	request.setAttribute("isScratchie", isScratchie);
+	
 	List<QbQuestion> otherVersions = qbService.getQuestionsByQuestionId(qbQuestion.getQuestionId());
 	request.setAttribute("otherVersions", otherVersions);
 	
Index: lams_central/web/css/qb-question.scss
===================================================================
diff -u -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/web/css/qb-question.scss	(.../qb-question.scss)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
+++ lams_central/web/css/qb-question.scss	(.../qb-question.scss)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -95,26 +95,26 @@
 }
 
 /*Style for text input fields. Rule does not apply in case this input has an error*/
-:not(.has-error) > input.borderless-text-input{
+:not(.has-error) > .borderless-text-input{
     border: 0;
     box-shadow: none;
     padding: 0;
 }
 
 /* Remove bold style from title field */
-input.borderless-text-input::-webkit-input-placeholder {
+.borderless-text-input::-webkit-input-placeholder {
     font-weight: normal;
     color:#999;
 }
-input.borderless-text-input::-moz-placeholder {
+.borderless-text-input::-moz-placeholder {
     font-weight: normal;
     color:#999;
 }
-input.borderless-text-input:-ms-input-placeholder {
+.borderless-text-input:-ms-input-placeholder {
     font-weight: normal;
     color:#999;
 }
-input.borderless-text-input:-o-input-placeholder {
+.borderless-text-input:-o-input-placeholder {
     font-weight: normal;
     color:#999;
 }
@@ -223,9 +223,9 @@
 	border: 0.02em solid #bdc3c7;
 	background: #e1e1e1;
 	color: #222222;
-	margin-top: -0.02em;
 	padding: 0.08em;
 	opacity:0.8;
+	height: .4em;
 }
 
 .ui-state-default, .ui-widget-content.ui-slider .ui-state-default{
Index: lams_central/web/includes/javascript/qb-option.js
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/web/includes/javascript/qb-option.js	(.../qb-option.js)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/includes/javascript/qb-option.js	(.../qb-option.js)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -105,31 +105,33 @@
 	}
     
     //init options sorting feature
-    new Sortable($('#option-table.sortable-on')[0], {
-	    animation: 150,
-	    ghostClass: 'sortable-placeholder',
-	    direction: 'vertical',
-		onStart: function (evt) {
-			//stop answers' hover effect, once element dragging started
-			//$("#option-table").removeClass("hover-active");
-		},
-		onEnd: function (evt) {
-			//activate answers' hover effect, once element dragging ended
-			//$("#option-table").delay(50).queue(function(next){
-			//    $(this).addClass("hover-active");
-			//    next();
-			//});
-		},
-		store: {
-			set: function (sortable) {
-				//update all displayOrders in order to later save it as options' order
-				var order = sortable.toArray();
-				for (var i = 0; i < order.length; i++) {
-				    var optionIndex = order[i];
-				    $('input[name="optionDisplayOrder' + optionIndex + '"]').val(i+1);
+	if ($('#option-table.sortable-on').length) {
+	    new Sortable($('#option-table.sortable-on')[0], {
+		    animation: 150,
+		    ghostClass: 'sortable-placeholder',
+		    direction: 'vertical',
+			onStart: function (evt) {
+				//stop answers' hover effect, once element dragging started
+				//$("#option-table").removeClass("hover-active");
+			},
+			onEnd: function (evt) {
+				//activate answers' hover effect, once element dragging ended
+				//$("#option-table").delay(50).queue(function(next){
+				//    $(this).addClass("hover-active");
+				//    next();
+				//});
+			},
+			store: {
+				set: function (sortable) {
+					//update all displayOrders in order to later save it as options' order
+					var order = sortable.toArray();
+					for (var i = 0; i < order.length; i++) {
+					    var optionIndex = order[i];
+					    $('input[name="optionDisplayOrder' + optionIndex + '"]').val(i+1);
+					}
 				}
 			}
-		}
-	});
+		});
+	}
 
 }
Index: lams_central/web/qb/authoring/addVsa.jsp
===================================================================
diff -u
--- lams_central/web/qb/authoring/addVsa.jsp	(revision 0)
+++ lams_central/web/qb/authoring/addVsa.jsp	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,231 @@
+<!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="3"	scope="request" />
+
+<lams:html>
+	<lams:head>
+		<%@ include file="addQuestionHeader.jsp"%>
+		<style>
+			textarea {
+			  resize: none;
+			}
+		</style>
+		
+  	    <script>
+			$(document).ready(function(){
+		    	$("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden, div.cke_editable',
+		    		rules: {
+		    			title: "required",
+		    			maxMark: {
+		    			      required: true,
+		    			      digits: true
+		    			},
+		    			penaltyFactor: {
+		    			      required: true,
+		    			      number: true
+		    			},
+		    			hasOptionFilled: {
+		    				required: function(element) {
+		    		        	return $("textarea[name^=optionName]:filled").length < 1;
+			    		    }			    		    
+	    			    },
+	    			    hasOnePositiveMaxMark: {
+		    				required: function(element) {
+		    					var hasOnePositiveMaxMark = false;
+		    					$("input[name^='optionMaxMark']").each(function() {
+		    						hasOnePositiveMaxMark = hasOnePositiveMaxMark || (eval(this.value) > 0);
+		    					});
+	    			    		return !hasOnePositiveMaxMark;
+			    		    }		    		    
+	    			    }
+		    		},
+		    		messages: {
+		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    			maxMark: {
+		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+		    			},
+		    			penaltyFactor: {
+		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
+		    			},
+		    			hasOptionFilled: "<fmt:message key='label.authoring.numerical.error.answer'/>",
+		    			hasOnePositiveMaxMark: {
+		    				required: "<fmt:message key='error.positive.grade.required'/>"
+		    			}
+		    		},
+     			    submitHandler: function(form) {
+     			    	prepareOptionEditorsForAjaxSubmit();     			    
+		    			$("#optionList").val($("#optionForm").serialize(true));
+		    			$("#description").val(CKEDITOR.instances.description.getData());
+		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
+		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
+		    			
+		    	    	var options = { 
+		    	    		target:  parent.jQuery('#itemArea'), 
+		    		   		success: afterRatingSubmit  // post-submit callback
+		    		    }; 				
+		    		    				
+		    			$('#assessmentQuestionForm').ajaxSubmit(options);
+		    		},
+		    		invalidHandler: formValidationInvalidHandler,
+					errorElement: "em",
+					errorPlacement: formValidationErrorPlacement,
+					success: formValidationSuccess,
+					highlight: formValidationHighlight,
+					unhighlight: formValidationUnhighlight
+		  		});
+			});
+
+			function autoGrowTextarea(element) {
+			    element.style.height = "5px";
+			    element.style.height = (element.scrollHeight)+"px";
+			}
+  		</script>
+</lams:head>
+<body>
+	<div class="panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.type.short.answer" />
+		</div>
+
+		<div class="panel-body">
+			
+			<form:form action="/lams/qb/edit/saveOrUpdateQuestion.do" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm"
+				method="post" autocomplete="off">
+				<form:hidden path="authoringRestricted"/>
+				<form:hidden path="sessionMapID" />
+				<form:hidden path="uid" />
+				<form:hidden path="questionId" />
+				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
+				<input type="hidden" name="optionList" id="optionList" />
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
+				<form:hidden path="contentFolderID" id="contentFolderID"/>
+
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
+				
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+					
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255"
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
+				
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="description" value="${assessmentQuestionForm.description}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
+					
+					<div>
+						<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+					</div>
+					<div>
+						<input type="text" name="hasOnePositiveMaxMark" id="hasOnePositiveMaxMark" class="fake-validation-input">
+					</div>
+				</div>
+				
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+				
+					<div>
+						<label class="switch">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="answer-required">
+							<fmt:message key="label.authoring.answer.required" />
+						</label>
+					</div>
+					
+					<c:if test="${!assessmentQuestionForm.authoringRestricted}">
+						<div class="form-group row form-inline">
+						    <label for="maxMark" class="col-sm-3">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />
+						    	<i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    
+						    <div class="col-sm-9">
+						    	<form:input path="maxMark" cssClass="form-control short-input-text input-sm"/>
+						    </div>
+						</div>
+					</c:if>
+					
+					<div class="form-group row form-inline">
+					    <label for="penaltyFactor" class="col-sm-3"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />
+							  <i class="fa fa-xs fa-asterisk text-danger" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					    </label>
+					    
+					    <div class="col-sm-9">
+					    	<form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					    </div>
+					</div>
+					
+					<div class="form-group row form-inline">
+						<label for="caseSensitive" class="col-sm-3">
+							<fmt:message key="label.authoring.short.answer.case.sensitivity" />
+						</label>
+						
+						<div class="col-sm-9">
+							<form:select path="caseSensitive" id="caseSensitive" cssClass="form-control input-sm">
+								<form:option value="false"><fmt:message key="label.authoring.short.answer.no.case.unimportant" /></form:option>
+								<form:option value="true"><fmt:message key="label.authoring.short.answer.yes.case.must.match" /></form:option>
+							</form:select>
+						</div>
+					</div>
+					
+					
+					<div>
+						<label class="switch">
+							<form:checkbox path="autocompleteEnabled" id="autocomplete-enabled"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="autocomplete-enabled">
+							<fmt:message key="label.autocomplete.as.student" />
+						</label>
+					</div>
+	
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					</div>
+					
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
+				</div>
+
+			</form:form>
+			
+			<!-- Options -->
+			<div class="question-tab">
+				<form id="optionForm" name="optionForm">
+					<%@ include file="optionlist.jsp"%>
+					
+					<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+						<fmt:message key="label.authoring.short.answer.add.answer" />  
+					</a>
+				</form>	
+			</div>	
+
+		</div>	
+	</div>	
+	
+	<%@ include file="addQuestionFooter.jsp"%>
+</body>
+</lams:html>
Fisheye: Tag e8a7110708b15579af2c6b31ac52a6da427fef6d refers to a dead (removed) revision in file `lams_central/web/qb/authoring/addshortanswer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/qb/authoring/optionlist.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/web/qb/authoring/optionlist.jsp	(.../optionlist.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/optionlist.jsp	(.../optionlist.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -83,7 +83,7 @@
 	<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 	
 	<div id="option-table" 
-		<c:if test="${!assessmentQuestionForm.authoringRestricted}">class="sortable-on"</c:if>>
+		<c:if test="${!assessmentQuestionForm.authoringRestricted && questionType != 3}">class="sortable-on"</c:if>>
 		
 		<c:forEach var="option" items="${optionList}" varStatus="status">
 			<table id="option-table-${status.index}" class="voffset10-bottom" data-id="${status.index}" tabindex="1">
@@ -101,8 +101,8 @@
 								<%@ include file="matchingpairoption.jsp"%>
 							</c:when>
 							<c:when test="${questionType == 3}">
-								<%@ include file="shortansweroption.jsp"%>
-							</c:when>					
+								<%@ include file="vsaOption.jsp"%>
+							</c:when>
 							<c:when test="${questionType == 4}">
 								<%@ include file="numericaloption.jsp"%>
 							</c:when>
Fisheye: Tag e8a7110708b15579af2c6b31ac52a6da427fef6d refers to a dead (removed) revision in file `lams_central/web/qb/authoring/shortansweroption.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/qb/authoring/vsaOption.jsp
===================================================================
diff -u
--- lams_central/web/qb/authoring/vsaOption.jsp	(revision 0)
+++ lams_central/web/qb/authoring/vsaOption.jsp	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,23 @@
+<input type="hidden" name="optionDisplayOrder${status.index}" value="${option.displayOrder}">
+<input type="hidden" name="optionUid${status.index}" value="${option.uid}">
+
+<div class="form-group">
+	<c:set var="OPTION_LABEL">
+		<fmt:message key="label.authoring.basic.option.answer"/>
+	</c:set>
+	<textarea name="optionName${status.index}" rows="3" class="form-control borderless-text-input"
+		placeholder="${OPTION_LABEL}&thinsp; ${status.index+1}"
+		oninput="autoGrowTextarea(this)"
+		><c:out value='${option.name}' /></textarea>
+</div>
+
+<div class="option-settings-hidden" style="display: none;">
+	<%@ include file="gradeselector.jsp"%>
+	
+	<div class="voffset5-bottom">
+	   	<c:set var="FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.option.feedback"/></c:set>
+	   	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" 
+	     	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="50px"/>
+	</div>
+</div>
+
Index: lams_central/web/qb/qbQuestionDetails.jsp
===================================================================
diff -u -rbc75f6b0213eeccefaf4b0b89298f757da37aaa2 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/web/qb/qbQuestionDetails.jsp	(.../qbQuestionDetails.jsp)	(revision bc75f6b0213eeccefaf4b0b89298f757da37aaa2)
+++ lams_central/web/qb/qbQuestionDetails.jsp	(.../qbQuestionDetails.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -10,10 +10,20 @@
 <div class="panel-body">
 	<input type="hidden" id="selected-question-uid" value="${question.uid}">
 	
-	<a id="import-button" class="btn btn-xs btn-default pull-right button-add-item" href="#nogo"
-		title="Import question from the question bank">
-		<fmt:message key="button.import"/>
-	</a>
+	<!-- hide import button in case of VSA which is not compatible with TBL -->
+	<c:choose>
+		<c:when test="${(question.type != 3) || !isScratchie || isVsaAndCompatibleWithTbl}">
+			<a id="import-button" class="btn btn-xs btn-default pull-right button-add-item" href="#nogo"
+				title="Import question from the question bank">
+				<fmt:message key="button.import"/>
+			</a>
+		</c:when>
+		<c:otherwise>
+			<span class="alert-warning pull-right loffset10">
+				Not compatible with TBL
+			</span>
+		</c:otherwise>
+	</c:choose>
 	
 	<a class="btn btn-xs btn-default pull-right loffset5" href="#nogo" onClick='javascript:window.open("<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=${question.uid}", "_blank")' title='Show stats'>
 		<i class='fa fa-bar-chart'></i>&nbsp;
Index: lams_central/web/qb/search.jsp
===================================================================
diff -u -r847b6e17a50b828bed3c01f1d168f7c4f81004c4 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 847b6e17a50b828bed3c01f1d168f7c4f81004c4)
+++ lams_central/web/qb/search.jsp	(.../search.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -236,7 +236,8 @@
         $("#question-detail-area").show().load(
   	       	'<c:url value="/searchQB/displayQuestionDetails.do"/>',
   	       	{
-  	       		questionUid: questionUid
+  	       		questionUid: questionUid,
+  	       		isScratchie: ${isScratchie}
   	    	},
   	    	function() {
   	    	}
Index: lams_common/src/java/org/lamsfoundation/lams/confidencelevel/VsaAnswerDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/confidencelevel/VsaAnswerDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/confidencelevel/VsaAnswerDTO.java	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,80 @@
+package org.lamsfoundation.lams.confidencelevel;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class VsaAnswerDTO {
+
+    private Long qbQuestionUid;
+    private Long qbOptionUid;
+    private String answer;
+    private boolean correct;
+    private Long userId;
+    private List<ConfidenceLevelDTO> confidenceLevels;
+    
+    public VsaAnswerDTO() {
+	this.confidenceLevels = new LinkedList<>();
+    }
+    
+    /**
+     */
+    public void setQbQuestionUid(Long qbQuestionUid) {
+	this.qbQuestionUid = qbQuestionUid;
+    }
+
+    public Long getQbQuestionUid() {
+	return this.qbQuestionUid;
+    }
+    
+    /**
+     */
+    public void setQbOptionUid(Long qbOptionUid) {
+	this.qbOptionUid = qbOptionUid;
+    }
+
+    public Long getQbOptionUid() {
+	return this.qbOptionUid;
+    }
+    
+    /**
+     */
+    public void setAnswer(String answer) {
+	this.answer = answer;
+    }
+
+    public String getAnswer() {
+	return this.answer;
+    }
+    
+    public void setCorrect(boolean correct) {
+	this.correct = correct;
+    }
+
+    public boolean isCorrect() {
+	return this.correct;
+    }
+    
+    public void setUserId(Long userId) {
+	this.userId = userId;
+    }
+
+    public Long getUserId() {
+	return this.userId;
+    }
+    
+    /**
+     */
+    public void setConfidenceLevels(List<ConfidenceLevelDTO> confidenceLevels) {
+	this.confidenceLevels = confidenceLevels;
+    }
+
+    /**
+     * Each ConfidenceLevelDTO contains userId, userName, portraitUuid, confidence level (if this option was enabled in
+     * Assessment)
+     * 
+     * @return
+     */
+    public List<ConfidenceLevelDTO> getConfidenceLevels() {
+	return this.confidenceLevels;
+    }
+}
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190913.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190913.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190913.sql	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4875 Add VSA question type to Assessment and Scratchie
+ALTER TABLE lams_qb_question ADD COLUMN autocomplete_enabled TINYINT(1) DEFAULT 0;
+								 	
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
===================================================================
diff -u -r9ebb0762842cde9a358626a248132bc7ca650f3c -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java	(.../QbQuestionForm.java)	(revision 9ebb0762842cde9a358626a248132bc7ca650f3c)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java	(.../QbQuestionForm.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -62,6 +62,7 @@
     private int maxWordsLimit;
     private int minWordsLimit;
     private boolean hedgingJustificationEnabled;
+    private boolean autocompleteEnabled;
     private boolean authoringRestricted;
     
     private Long oldCollectionUid;
@@ -270,7 +271,15 @@
     public void setHedgingJustificationEnabled(boolean hedgingJustificationEnabled) {
 	this.hedgingJustificationEnabled = hedgingJustificationEnabled;
     }
+    
+    public boolean isAutocompleteEnabled() {
+	return autocompleteEnabled;
+    }
 
+    public void setAutocompleteEnabled(boolean autocompleteEnabled) {
+	this.autocompleteEnabled = autocompleteEnabled;
+    }
+
     public boolean isAuthoringRestricted() {
 	return authoringRestricted;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r3190bef4d1c10ac3e955dd0492d6747ae4975629 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 3190bef4d1c10ac3e955dd0492d6747ae4975629)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -37,7 +37,7 @@
     // not all tools can produce/consume all question types
     public static final int TYPE_MULTIPLE_CHOICE = 1;
     public static final int TYPE_MATCHING_PAIRS = 2;
-    public static final int TYPE_SHORT_ANSWER = 3;
+    public static final int TYPE_VERY_SHORT_ANSWERS = 3;
     public static final int TYPE_NUMERICAL = 4;
     public static final int TYPE_TRUE_FALSE = 5;
     public static final int TYPE_ESSAY = 6;
@@ -131,9 +131,13 @@
     @Column(name = "min_words_limit")
     private int minWordsLimit;
 
-    // only for hedging maxMark type of question
+    /** ---- only for hedging type of question ---- */
     @Column(name = "hedging_justification_enabled")
     private boolean hedgingJustificationEnabled;
+    
+    /** ---- only for VSA type of question ---- */
+    @Column(name = "autocomplete_enabled")
+    private boolean autocompleteEnabled;
 
     @OneToMany(mappedBy = "qbQuestion", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     @Fetch(FetchMode.SUBSELECT)
@@ -172,7 +176,7 @@
 		    if (((oldQuestion.getType() == QbQuestion.TYPE_ORDERING)
 			    && (oldOption.getDisplayOrder() != newOption.getDisplayOrder()))
 			    //short answer
-			    || ((oldQuestion.getType() == QbQuestion.TYPE_SHORT_ANSWER)
+			    || ((oldQuestion.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS)
 				    && !StringUtils.equals(oldOption.getName(), newOption.getName()))
 			    //numbering
 			    || (oldOption.getNumericalOption() != newOption.getNumericalOption())
@@ -248,7 +252,25 @@
 	    }
 	}
     }
+    
+    /**
+     * Check if it's a TBL case, i.e. only two option groups available, one has 0%, second - 100%
+     */
+    public boolean isVsaAndCompatibleWithTbl() {
+	boolean isVsaAndCompatibleWithTbl = false;
+	
+	if (qbOptions.size() == 2) {
+	    float firstGroupMark = qbOptions.get(0).getMaxMark();
+	    float secondGroupMark = qbOptions.get(1).getMaxMark();
 
+	    isVsaAndCompatibleWithTbl = (firstGroupMark == 0 || firstGroupMark == 1)
+		    && (secondGroupMark == 0 || secondGroupMark == 1) && (firstGroupMark != secondGroupMark)
+		    && type == QbQuestion.TYPE_VERY_SHORT_ANSWERS;
+	}
+	
+	return isVsaAndCompatibleWithTbl;
+    }
+
     public Long getUid() {
 	return uid;
     }
@@ -454,7 +476,15 @@
     public void setHedgingJustificationEnabled(boolean hedgingJustificationEnabled) {
 	this.hedgingJustificationEnabled = hedgingJustificationEnabled;
     }
+    
+    public boolean isAutocompleteEnabled() {
+	return autocompleteEnabled;
+    }
 
+    public void setAutocompleteEnabled(boolean autocompleteEnabled) {
+	this.autocompleteEnabled = autocompleteEnabled;
+    }
+
     public boolean isPrefixAnswersWithLetters() {
 	return prefixAnswersWithLetters;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,19 @@
+package org.lamsfoundation.lams.tool.service;
+
+import java.util.Collection;
+
+import org.lamsfoundation.lams.confidencelevel.VsaAnswerDTO;
+
+public interface ICommonAssessmentService {
+    
+    /**
+     * Returns answers learners left for VSA questions in Assessment activity (together with according confidence
+     * levels, if such option is turned on in Assessment). Currently only Assessment tool is capable of producing VSA
+     * answers.
+     * 
+     * @param toolSessionId
+     * @return
+     */
+    Collection<VsaAnswerDTO> getVsaAnswers(Long toolSessionId);
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(.../ILamsCoreToolService.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(.../ILamsCoreToolService.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -23,10 +23,12 @@
 
 package org.lamsfoundation.lams.tool.service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.SortedMap;
 
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
+import org.lamsfoundation.lams.confidencelevel.VsaAnswerDTO;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
@@ -280,6 +282,16 @@
      * @return
      */
     List<ConfidenceLevelDTO> getConfidenceLevelsByToolSession(ToolSession toolSession);
+    
+    /**
+     * Returns answers learners left for VSA questions in Assessment activity (together with according confidence
+     * levels, if such option is turned on in Assessment). Currently only Assessment tool is capable of producing VSA
+     * answers.
+     * 
+     * @param toolSession
+     * @return
+     */
+    Collection<VsaAnswerDTO> getVsaAnswersByToolSession(ToolSession toolSession);
 
     /**
      * Notifies tool that the user is force completed. Currently it's been utilized only by leader aware tools, which
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -23,13 +23,14 @@
 package org.lamsfoundation.lams.tool.service;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
+import org.lamsfoundation.lams.confidencelevel.VsaAnswerDTO;
 import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
-import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolSession;
@@ -185,7 +186,16 @@
      *            toolContentId of the specified activity
      * @return
      */
-    Set<ToolActivity> getPrecedingConfidenceLevelsActivities(Long toolContentId);
+    Set<ToolActivity> getActivitiesProvidingConfidenceLevels(Long toolContentId);
+    
+    /**
+     * Returns all activities that precede specified activity and can provide VSA answers.
+     *
+     * @param toolContentId
+     *            toolContentId of the specified activity
+     * @return
+     */
+    Set<ToolActivity> getActivitiesProvidingVsaAnswers(Long toolContentId);
 
     /**
      * Returns confidence levels from the specified activity.
@@ -200,6 +210,20 @@
      */
     List<ConfidenceLevelDTO> getConfidenceLevelsByActivity(Integer confidenceLevelActivityUiid, Integer requestorUserId,
 	    Long requestorToolSessionId);
+    
+    /**
+     * Returns VSA answers from the specified activity.
+     *
+     * @param activityUiid
+     *            activityUiid of the activity providing VSA answers
+     * @param requestorUserId
+     *            userId of the requesting user. we need it in order to get tool's sessionId providing VSA answers
+     * @param requestorToolSessionId
+     *            toolSessionId of the activity that calls this method
+     * @return
+     */
+    Collection<VsaAnswerDTO> getVsaAnswersFromAssessment(Integer activityUiidProvidingVsaAnswers,
+	    Integer requestorUserId, Long requestorToolSessionId);
 
     /**
      * Get a count of all the users that would be returned by getUsersForActivity(Long toolSessionId);
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
diff -u -r9f98b5e2b822f824d857d3d677f21b1149f794c8 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 9f98b5e2b822f824d857d3d677f21b1149f794c8)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -23,6 +23,7 @@
 
 package org.lamsfoundation.lams.tool.service;
 
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -31,6 +32,7 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
+import org.lamsfoundation.lams.confidencelevel.VsaAnswerDTO;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ActivityEvaluation;
 import org.lamsfoundation.lams.learningdesign.ComplexActivity;
@@ -62,6 +64,7 @@
 import org.lamsfoundation.lams.tool.exception.RequiredGroupMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -534,6 +537,45 @@
     }
 
     @Override
+    public Collection<VsaAnswerDTO> getVsaAnswersByToolSession(ToolSession toolSession) {
+
+	if (toolSession == null) {
+	    String error = "The toolSession is null. Unable to get confidence levels";
+	    LamsCoreToolService.log.error(error);
+	    throw new DataMissingException(error);
+	}
+
+	Tool tool = toolSession.getToolActivity().getTool();
+	if (tool == null) {
+	    String error = "The tool for toolSession " + toolSession.getToolSessionId() + " is missing.";
+	    LamsCoreToolService.log.error(error);
+	    throw new DataMissingException(error);
+	}
+	
+	if (!CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(tool.getToolSignature())) {
+	    String error = "Only Assessment is capable of providing VSA answers. Bu this session belongs to tool: "
+		    + tool.getToolSignature();
+	    LamsCoreToolService.log.error(error);
+	    throw new DataMissingException(error);
+	}
+
+	try {
+	    ICommonAssessmentService sessionManager = (ICommonAssessmentService) findToolService(tool);
+	    return sessionManager.getVsaAnswers(toolSession.getToolSessionId());
+	} catch (NoSuchBeanDefinitionException e) {
+	    String message = "A tool which is defined in the database appears to missing from the classpath. Unable to get the tool output. toolActivity "
+		    + toolSession.getToolActivity().getActivityId();
+	    LamsCoreToolService.log.error(message, e);
+	    throw new ToolException(message, e);
+	} catch (java.lang.AbstractMethodError e) {
+	    String message = "Tool " + tool.getToolDisplayName()
+		    + " doesn't support the getToolOutput(name, toolSessionId, learnerId) method so no output definitions can be accessed.";
+	    LamsCoreToolService.log.error(message, e);
+	    throw new ToolException(message, e);
+	}
+    }
+    
+    @Override
     public List<ConfidenceLevelDTO> getConfidenceLevelsByToolSession(ToolSession toolSession) {
 
 	if (toolSession == null) {
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -24,6 +24,7 @@
 package org.lamsfoundation.lams.tool.service;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -35,6 +36,7 @@
 import org.hibernate.Hibernate;
 import org.hibernate.proxy.HibernateProxy;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
+import org.lamsfoundation.lams.confidencelevel.VsaAnswerDTO;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -357,7 +359,7 @@
     }
 
     @Override
-    public Set<ToolActivity> getPrecedingConfidenceLevelsActivities(Long toolContentId) {
+    public Set<ToolActivity> getActivitiesProvidingConfidenceLevels(Long toolContentId) {
 	ToolActivity specifiedActivity = activityDAO.getToolActivityByToolContentId(toolContentId);
 
 	//if specifiedActivity is null - most likely author hasn't saved the sequence yet
@@ -366,7 +368,7 @@
 	}
 
 	Set<Long> confidenceProvidingActivityIds = new LinkedHashSet<Long>();
-	findPrecedingConfidenceProvidingActivities(specifiedActivity, confidenceProvidingActivityIds);
+	findPrecedingAssessmentAndMcqActivities(specifiedActivity, confidenceProvidingActivityIds, true);
 
 	Set<ToolActivity> confidenceProvidingActivities = new LinkedHashSet<ToolActivity>();
 	for (Long confidenceProvidingActivityId : confidenceProvidingActivityIds) {
@@ -383,8 +385,8 @@
      * them). Please note, it does not check whether enableConfidenceLevels advanced option is ON in those activities.
      */
     @SuppressWarnings("rawtypes")
-    private void findPrecedingConfidenceProvidingActivities(Activity activity,
-	    Set<Long> confidenceProvidingActivityIds) {
+    private void findPrecedingAssessmentAndMcqActivities(Activity activity,
+	    Set<Long> confidenceProvidingActivityIds, boolean isMcqIncluded) {
 	// check if current activity is Leader Select one. if so - stop searching and return it.
 	Class activityClass = Hibernate.getClass(activity);
 	if (activityClass.equals(ToolActivity.class)) {
@@ -401,7 +403,8 @@
 	    }
 
 	    String toolSignature = toolActivity.getTool().getToolSignature();
-	    if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature) || TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
+	    if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)
+		    || isMcqIncluded && TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
 		confidenceProvidingActivityIds.add(toolActivity.getActivityId());
 	    }
 
@@ -412,7 +415,7 @@
 		if (activityIter instanceof ToolActivity) {
 		    String toolSignatureIter = ((ToolActivity) activityIter).getTool().getToolSignature();
 		    if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignatureIter)
-			    || TOOL_SIGNATURE_MCQ.equals(toolSignatureIter)) {
+			    || isMcqIncluded && TOOL_SIGNATURE_MCQ.equals(toolSignatureIter)) {
 			confidenceProvidingActivityIds.add(activityIter.getActivityId());
 		    }
 		}
@@ -424,18 +427,40 @@
 	Transition transitionTo = activity.getTransitionTo();
 	if (transitionTo != null) {
 	    Activity fromActivity = transitionTo.getFromActivity();
-	    findPrecedingConfidenceProvidingActivities(fromActivity, confidenceProvidingActivityIds);
+	    findPrecedingAssessmentAndMcqActivities(fromActivity, confidenceProvidingActivityIds, isMcqIncluded);
 	    return;
 	}
 
 	// check parent activity
 	Activity parent = activity.getParentActivity();
 	if (parent != null) {
-	    findPrecedingConfidenceProvidingActivities(parent, confidenceProvidingActivityIds);
+	    findPrecedingAssessmentAndMcqActivities(parent, confidenceProvidingActivityIds, isMcqIncluded);
 	    return;
 	}
     }
+    
+    @Override
+    public Set<ToolActivity> getActivitiesProvidingVsaAnswers(Long toolContentId) {
+	ToolActivity specifiedActivity = activityDAO.getToolActivityByToolContentId(toolContentId);
 
+	//if specifiedActivity is null - most likely author hasn't saved the sequence yet
+	if (specifiedActivity == null) {
+	    return null;
+	}
+
+	Set<Long> providingVsaAnswersActivityIds = new LinkedHashSet<Long>();
+	findPrecedingAssessmentAndMcqActivities(specifiedActivity, providingVsaAnswersActivityIds, false);
+
+	Set<ToolActivity> activitiesProvidingVsaAnswers = new LinkedHashSet<ToolActivity>();
+	for (Long confidenceProvidingActivityId : providingVsaAnswersActivityIds) {
+	    ToolActivity activityProvidingVsaAnswers = (ToolActivity) activityDAO
+		    .getActivityByActivityId(confidenceProvidingActivityId, ToolActivity.class);
+	    activitiesProvidingVsaAnswers.add(activityProvidingVsaAnswers);
+	}
+
+	return activitiesProvidingVsaAnswers;
+    }
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevelsByActivity(Integer confidenceLevelActivityUiid,
 	    Integer requestorUserId, Long requestorToolSessionId) {
@@ -458,7 +483,26 @@
 
 	return confidenceLevelDtos;
     }
+    
+    @Override
+    public Collection<VsaAnswerDTO> getVsaAnswersFromAssessment(Integer activityUiidProvidingVsaAnswers,
+	    Integer requestorUserId, Long requestorToolSessionId) {
+	User user = (User) activityDAO.find(User.class, requestorUserId);
+	if (user == null) {
+	    throw new ToolException("No user found for userId=" + requestorUserId);
+	}
 
+	ToolSession requestorSession = toolSessionDAO.getToolSession(requestorToolSessionId);
+	if (requestorSession == null) {
+	    throw new ToolException("No session found for toolSessionId=" + requestorToolSessionId);
+	}
+
+	Activity activityProvidingVsaAnswers = activityDAO.getActivityByUIID(activityUiidProvidingVsaAnswers,
+		requestorSession.getToolActivity().getLearningDesign());
+	ToolSession assessmentSession = toolSessionDAO.getToolSessionByLearner(user, activityProvidingVsaAnswers);
+	return lamsCoreToolService.getVsaAnswersByToolSession(assessmentSession);
+    }
+
     @Override
     public Integer getCountUsersForActivity(Long toolSessionId) {
 	ToolSession session = toolSessionDAO.getToolSession(toolSessionId);
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -24,7 +24,7 @@
 label.authoring.basic.list.header.question  =Question
 label.authoring.basic.type.multiple.choice  =Multiple choice
 label.authoring.basic.type.matching.pairs  =Matching pairs
-label.authoring.basic.type.short.answer  =Short answer
+label.authoring.basic.type.short.answer  =Very short answers
 label.authoring.basic.type.numerical  =Numerical
 label.authoring.basic.type.true.false  =True/False
 label.authoring.basic.type.essay  =Essay
@@ -297,5 +297,12 @@
 message.qb.modified.version =A new version of the question will be created in Question Bank
 message.qb.modified.new =A new question will be created in Question Bank
 label.import.from.question.bank  =Import from question bank
+label.answer.queue  =Answer queue
+label.drag.and.drop  =drag and drop answer to tick or cross
+label.correct  =Correct
+label.incorrect  =Incorrect
+label.answer.alternatives  =Answer alternatives
+label.close=Close
 
+
 #======= End labels: Exported 337 labels for en AU =====
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -rf9c66e78afa51f175afcaf22ee81f9b3460afea8 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision f9c66e78afa51f175afcaf22ee81f9b3460afea8)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -138,6 +138,7 @@
                 <prop key="store*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="set*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="unset*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="allocateAnswerToOption">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="launchTimeLimit">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="processUserAnswers">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java	(.../AssessmentQuestionResultDAO.java)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java	(.../AssessmentQuestionResultDAO.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -37,6 +37,8 @@
     List<Object[]> getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid);
 
     AssessmentQuestionResult getAssessmentQuestionResultByUid(Long questionResultUid);
+    
+    List<AssessmentQuestionResult> getQuestionResultsByQuestionUid(final Long questionUid);
 
     /**
      * Returns question result mark from the last finished assessment result, and null if not available.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
===================================================================
diff -u -rb41c8a8bc5134e78088378360a37f3906fadb3de -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision b41c8a8bc5134e78088378360a37f3906fadb3de)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -42,6 +42,9 @@
 	    + AssessmentQuestionResult.class.getName() + " AS q, " + AssessmentResult.class.getName() + " AS r "
 	    + " WHERE q.assessmentResult.uid = r.uid and r.assessment.uid = ? AND r.user.userId =? AND q.qbToolQuestion.uid =? ORDER BY r.startDate ASC";
 
+    private static final String FIND_BY_QUESTION_UID = "FROM " + AssessmentQuestionResult.class.getName()
+	    + " AS queRes " + " WHERE queRes.qbToolQuestion.uid =:questionUid ORDER BY queRes.finishDate ASC";
+    
     private static final String FIND_WRONG_ANSWERS_NUMBER = "SELECT COUNT(q) FROM  "
 	    + AssessmentQuestionResult.class.getName() + " AS q, " + AssessmentResult.class.getName() + " AS r "
 	    + " WHERE q.assessmentResult.uid = r.uid AND r.assessment.uid = ? AND r.user.userId =? AND q.qbToolQuestion.uid =? AND (ROUND(q.mark + q.penalty) < q.maxMark) AND (r.finishDate != null)";
@@ -77,6 +80,16 @@
     }
 
     @Override
+    public List<AssessmentQuestionResult> getQuestionResultsByQuestionUid(final Long questionUid) {
+	String FIND_BY_QUESTION_UID = "FROM " + AssessmentQuestionResult.class.getName()
+		    + " AS queRes " + " WHERE queRes.qbToolQuestion.uid =:questionUid ORDER BY queRes.finishDate ASC";
+	Query<AssessmentQuestionResult> q = getSession().createQuery(FIND_BY_QUESTION_UID,
+		AssessmentQuestionResult.class);
+	q.setParameter("questionUid", questionUid);
+	return q.getResultList();
+    }
+
+    @Override
     public Float getQuestionResultMark(final Long assessmentUid, final Long userId, final int questionDisplayOrder) {
 	Query<Number> q = getSession().createQuery(GET_ANSWER_MARK, Number.class);
 	q.setParameter("assessmentUid", assessmentUid);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190913.sql
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190913.sql	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190913.sql	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4875 Add VSA question type to Assessment and Scratchie
+ALTER TABLE tl_lascrt11_scratchie ADD COLUMN activity_uuid_providing_vsa_answers INT(11);
+								 	
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
===================================================================
diff -u -r2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java	(.../QuestionDTO.java)	(revision 2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java	(.../QuestionDTO.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -61,6 +61,8 @@
     private int minWordsLimit;
 
     private boolean hedgingJustificationEnabled;
+    
+    private boolean autocompleteEnabled;
 
     private boolean correctAnswersDisclosed;
 
@@ -137,6 +139,7 @@
 	this.maxWordsLimit = qbQuestion.getMaxWordsLimit();
 	this.minWordsLimit = qbQuestion.getMinWordsLimit();
 	this.hedgingJustificationEnabled = qbQuestion.isHedgingJustificationEnabled();
+	this.autocompleteEnabled = qbQuestion.isAutocompleteEnabled();
 
 	optionDtos = new TreeSet<>();
 	for (QbOption option : qbQuestion.getQbOptions()) {
@@ -332,7 +335,15 @@
     public void setHedgingJustificationEnabled(boolean hedgingJustificationEnabled) {
 	this.hedgingJustificationEnabled = hedgingJustificationEnabled;
     }
+    
+    public boolean isAutocompleteEnabled() {
+	return autocompleteEnabled;
+    }
 
+    public void setAutocompleteEnabled(boolean autocompleteEnabled) {
+	this.autocompleteEnabled = autocompleteEnabled;
+    }
+
     public boolean isCorrectAnswersDisclosed() {
 	return correctAnswersDisclosed;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java	(.../QuestionSummary.java)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java	(.../QuestionSummary.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -50,6 +50,11 @@
     private QuestionDTO questionDto;
     private float averageMark;
 
+    //used only for question summary page
+    private List<AssessmentQuestionResult> notAllocatedQuestionResults;
+    private boolean isTbl;
+    
+    //used only for export
     private List<List<AssessmentQuestionResult>> questionResultsPerSession;
     
     public QuestionSummary(AssessmentQuestion question) {
@@ -71,7 +76,23 @@
     public void setAverageMark(float averageMark) {
 	this.averageMark = averageMark;
     }
+    
+    public List<AssessmentQuestionResult> getNotAllocatedQuestionResults() {
+	return notAllocatedQuestionResults;
+    }
 
+    public void setNotAllocatedQuestionResults(List<AssessmentQuestionResult> notAllocatedQuestionResults) {
+	this.notAllocatedQuestionResults = notAllocatedQuestionResults;
+    }
+    
+    public boolean isTbl() {
+	return isTbl;
+    }
+
+    public void setTbl(boolean isTbl) {
+	this.isTbl = isTbl;
+    }
+
     public List<List<AssessmentQuestionResult>> getQuestionResultsPerSession() {
 	return questionResultsPerSession;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
===================================================================
diff -u -r7b01f2faaa0d72d872e4624687e4c269b8bf522a -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java	(.../AssessmentImportContentVersionFilter.java)	(revision 7b01f2faaa0d72d872e4624687e4c269b8bf522a)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java	(.../AssessmentImportContentVersionFilter.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -186,6 +186,8 @@
 			"prefixAnswersWithLetters", "false", false, true);
 		XMLUtil.rewriteTextElement(assessmentQuestion, qbQuestion, "caseSensitive", "caseSensitive", "false",
 			false, true);
+		XMLUtil.rewriteTextElement(assessmentQuestion, qbQuestion, "autocompleteEnabled",
+			"autocompleteEnabled", "false", false, true);
 		XMLUtil.rewriteTextElement(assessmentQuestion, qbQuestion, "correctAnswer", "correctAnswer", "false",
 			false, true);
 		XMLUtil.rewriteTextElement(assessmentQuestion, qbQuestion, "allowRichEditor", "allowRichEditor",
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r3004d09a72bb86597e40ef2277e1e158b6b62b0a -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 3004d09a72bb86597e40ef2277e1e158b6b62b0a)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -49,6 +49,7 @@
 import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
+import org.lamsfoundation.lams.confidencelevel.VsaAnswerDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -103,6 +104,7 @@
 import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.tool.service.ICommonAssessmentService;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -111,6 +113,7 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -120,8 +123,8 @@
 /**
  * @author Andrey Balan
  */
-public class AssessmentServiceImpl
-	implements IAssessmentService, ToolContentManager, ToolSessionManager, ToolRestManager {
+public class AssessmentServiceImpl implements IAssessmentService, ICommonAssessmentService, ToolContentManager,
+	ToolSessionManager, ToolRestManager {
     private static Logger log = Logger.getLogger(AssessmentServiceImpl.class.getName());
 
     private AssessmentDAO assessmentDao;
@@ -743,7 +746,7 @@
 		}
 	    }
 
-	} else if (questionDto.getType() == QbQuestion.TYPE_SHORT_ANSWER) {
+	} else if (questionDto.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS) {
 	    //clear previous answer
 	    questionResult.setQbOption(null);
 
@@ -1315,11 +1318,133 @@
     @Override
     public QuestionSummary getQuestionSummary(Long contentId, Long questionUid) {
 	AssessmentQuestion question = assessmentQuestionDao.getByUid(questionUid);
+	QbQuestion qbQuestion = question.getQbQuestion();
+	List<AssessmentQuestionResult> allQuestionResults = assessmentQuestionResultDao
+		.getQuestionResultsByQuestionUid(questionUid);
 
-	return new QuestionSummary(question);
+	QuestionSummary questionSummary = new QuestionSummary(question);
+
+	//prepare extra data for VSA type of questions, so teachers can allocate answers into groups
+	if (question.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS) {
+	    //find all questionResults that are not allocated into groups yet
+	    List<AssessmentQuestionResult> notAllocatedQuestionResults = new ArrayList<>();
+	    for (AssessmentQuestionResult questionResult : allQuestionResults) {
+		String answer = questionResult.getAnswer();
+
+		boolean isAnswerAllocated = false;
+		for (QbOption option : qbQuestion.getQbOptions()) {
+		    String[] alternatives = option.getName().split("\r\n");
+		    for (String alternative : alternatives) {
+			if (answer != null && alternative.equals(answer)) {
+			    isAnswerAllocated = true;
+			    break;
+			}
+		    }
+		}
+
+		if (!isAnswerAllocated) {
+		    notAllocatedQuestionResults.add(questionResult);
+		}
+	    }
+	    questionSummary.setNotAllocatedQuestionResults(notAllocatedQuestionResults);
+
+	    //check is it a TBL case, i.e. only two option groups available, one has 0%, second - 100%
+	    boolean isCompatibleWithTbl = qbQuestion.isVsaAndCompatibleWithTbl();  
+	    questionSummary.setTbl(isCompatibleWithTbl);
+	}
+	
+	return questionSummary;
     }
 
     @Override
+    public void allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid,
+	    Long questionResultUid) {
+	AssessmentQuestion question = assessmentQuestionDao.getByUid(questionUid);
+	QbQuestion qbQuestion = question.getQbQuestion();
+	AssessmentQuestionResult questionResult = assessmentQuestionResultDao.getAssessmentQuestionResultByUid(questionResultUid);
+	String answer = questionResult.getAnswer();
+	
+	//adding
+	if (previousOptionUid.equals(-1L)) {
+	    for (QbOption targetOption : qbQuestion.getQbOptions()) {
+		if (targetOption.getUid().equals(targetOptionUid)) {
+		    String name = targetOption.getName();
+		    name += "\r\n" + answer;
+		    targetOption.setName(name);
+		    assessmentDao.saveObject(targetOption);
+		    break;
+		}
+	    }
+
+	}
+	//removing
+	else if (targetOptionUid.equals(-1L)) {
+	    for (QbOption previousOption : qbQuestion.getQbOptions()) {
+		if (previousOption.getUid().equals(previousOptionUid)) {
+		    String name = previousOption.getName();
+		    String[] alternatives = name.split("\r\n");
+		    
+		    String nameWithoutUserAnswer = "";
+		    for (String alternative : alternatives) {
+			if (!alternative.equals(answer)) {
+			    nameWithoutUserAnswer += alternative + "\r\n";
+			}
+		    }
+		    if (nameWithoutUserAnswer.length() > 2) {
+			previousOption.setName(nameWithoutUserAnswer.substring(0, nameWithoutUserAnswer.length() - 2));
+			assessmentDao.saveObject(previousOption);
+		    }
+		    break;
+		}
+	    }
+	    
+	}
+	//reshuffling inside the same container - do nothing
+	else if (targetOptionUid.equals(previousOptionUid)) {
+	    
+	}
+	//moving from one to another
+	else {
+	    for (QbOption targetOption : qbQuestion.getQbOptions()) {
+		if (targetOption.getUid().equals(targetOptionUid)) {
+		    String name = targetOption.getName();
+		    name += "\r\n" + answer;
+		    targetOption.setName(name);
+		    assessmentDao.saveObject(targetOption);
+		    break;
+		}
+	    }
+	    
+	    for (QbOption previousOption : qbQuestion.getQbOptions()) {
+		if (previousOption.getUid().equals(previousOptionUid)) {
+		    String name = previousOption.getName();
+		    String[] alternatives = name.split("\r\n");
+		    
+		    String nameWithoutUserAnswer = "";
+		    for (String alternative : alternatives) {
+			if (!alternative.equals(answer)) {
+			    nameWithoutUserAnswer += alternative + "\r\n";
+			}
+		    }
+		    if (nameWithoutUserAnswer.length() > 2) {
+			nameWithoutUserAnswer = nameWithoutUserAnswer.substring(0, nameWithoutUserAnswer.length() - 2);
+		    }
+		    previousOption.setName(nameWithoutUserAnswer);
+		    assessmentDao.saveObject(previousOption);
+		    break;
+		}
+	    }
+	}
+	
+	//recalculate marks for all lessons in all cases except for reshuffling inside the same container
+	if (!targetOptionUid.equals(previousOptionUid)) {
+	    //TODO
+	    //recalculateUserAnswers(assessmentUid, toolContentId, oldQuestions, newQuestions, oldReferences, newReferences);
+
+	}
+    }
+
+    @Override
     public Map<Long, QuestionSummary> getQuestionSummaryForExport(Assessment assessment) {
 	Map<Long, QuestionSummary> questionSummaries = new LinkedHashMap<>();
 
@@ -1599,7 +1724,7 @@
 
 		// set up the summary table data for the top of the question area.
 		boolean doSummaryTable = question.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE
-			|| question.getType() == QbQuestion.TYPE_SHORT_ANSWER
+			|| question.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS
 			|| question.getType() == QbQuestion.TYPE_NUMERICAL
 			|| question.getType() == QbQuestion.TYPE_TRUE_FALSE;
 		// For MC, Numeric & Short Answer Key is optionUid, Value is number of answers
@@ -1959,7 +2084,7 @@
 	    Long trueKey, Long falseKey) {
 	ExcelCell[] summaryTable;
 	int i = 0;
-	if (question.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE || question.getType() == QbQuestion.TYPE_SHORT_ANSWER
+	if (question.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE || question.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS
 		|| question.getType() == QbQuestion.TYPE_NUMERICAL) {
 	    List<QbOption> options = question.getQbQuestion().getQbOptions();
 	    summaryTable = new ExcelCell[options.size() + 1];
@@ -2015,7 +2140,7 @@
 	    if (!foundOption) {
 		summaryNACount++;
 	    }
-	} else if (question.getType() == QbQuestion.TYPE_SHORT_ANSWER
+	} else if (question.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS
 		|| question.getType() == QbQuestion.TYPE_NUMERICAL) {
 	    Long submittedOptionUid = questionResult.getQbOption() == null ? null
 		    : questionResult.getQbOption().getUid();
@@ -2057,7 +2182,7 @@
 	    total += value;
 	}
 	int i = 0;
-	if (question.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE || question.getType() == QbQuestion.TYPE_SHORT_ANSWER
+	if (question.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE || question.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS
 		|| question.getType() == QbQuestion.TYPE_NUMERICAL) {
 	    for (QbOption option : question.getQbQuestion().getQbOptions()) {
 		summaryTable[i] = new ExcelCell(valueAsPercentage(summaryOfAnswers.get(option.getUid()), total), false);
@@ -2092,7 +2217,7 @@
 		return "Numerical";
 	    case QbQuestion.TYPE_ORDERING:
 		return "Ordering";
-	    case QbQuestion.TYPE_SHORT_ANSWER:
+	    case QbQuestion.TYPE_VERY_SHORT_ANSWERS:
 		return "Short Answer";
 	    case QbQuestion.TYPE_TRUE_FALSE:
 		return "True/False";
@@ -2196,7 +2321,7 @@
 			    if (oldOption.getDisplayOrder() == newOption.getDisplayOrder()) {
 
 				//short answer
-				if (((oldQuestion.getType() == QbQuestion.TYPE_SHORT_ANSWER)
+				if (((oldQuestion.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS)
 					&& !StringUtils.equals(oldOption.getName(), newOption.getName()))
 					//numbering
 					|| (oldOption.getNumericalOption() != newOption.getNumericalOption())
@@ -2884,7 +3009,7 @@
 
 		} else if (qbQuestion.getType() == QbQuestion.TYPE_MATCHING_PAIRS) {
 
-		} else if (qbQuestion.getType() == QbQuestion.TYPE_SHORT_ANSWER) {
+		} else if (qbQuestion.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS) {
 		    answers.add(questionResult.getAnswer());
 
 		} else if (qbQuestion.getType() == QbQuestion.TYPE_NUMERICAL) {
@@ -2934,7 +3059,79 @@
 
 	return confidenceLevelDtos;
     }
+    
+    @Override
+    public Collection<VsaAnswerDTO> getVsaAnswers(Long toolSessionId) {
+	if (toolSessionId == null) {
+	    return new ArrayList<>();
+	}
+	
+	Map<String, VsaAnswerDTO> uid_answerToVsaAnswerDtoMap = new LinkedHashMap<>();
 
+	Assessment assessment = getAssessmentBySessionId(toolSessionId);
+	//in case Assessment is leader aware return all leaders confidences, otherwise - confidences from the users from the same group as requestor
+	List<Object[]> assessmentResultsAndPortraits = assessment.isUseSelectLeaderToolOuput()
+		? assessmentResultDao.getLeadersLastFinishedAssessmentResults(assessment.getContentId())
+		: assessmentResultDao.getLastFinishedAssessmentResultsBySession(toolSessionId);
+
+	for (Object[] assessmentResultsAndPortraitIter : assessmentResultsAndPortraits) {
+	    AssessmentResult assessmentResult = (AssessmentResult) assessmentResultsAndPortraitIter[0];
+	    Long portraitUuid = assessmentResultsAndPortraitIter[1] == null ? null
+		    : ((Number) assessmentResultsAndPortraitIter[1]).longValue();
+	    AssessmentUser user = assessmentResult.getUser();
+
+	    //fill in question's and user answer's hashes
+	    for (AssessmentQuestionResult questionResult : assessmentResult.getQuestionResults()) {
+		QbQuestion qbQuestion = questionResult.getQbQuestion();
+
+		if (qbQuestion.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS) {
+		    //uid_answer should be unique in the final list
+		    String uid_answer = qbQuestion.getUid() + "_" + questionResult.getAnswer();
+		    
+		    //find VsaAnswerDTO in the map, or create the new one if it doesn't exist
+		    VsaAnswerDTO vsaAnswerDTO;
+		    if (uid_answerToVsaAnswerDtoMap.containsKey(uid_answer)) {
+			vsaAnswerDTO = uid_answerToVsaAnswerDtoMap.get(uid_answer);
+			
+		    } else {
+			vsaAnswerDTO = new VsaAnswerDTO();
+			vsaAnswerDTO.setQbQuestionUid(qbQuestion.getUid());
+			vsaAnswerDTO.setAnswer(questionResult.getAnswer());
+			vsaAnswerDTO.setCorrect(questionResult.getMark() > 0);
+			vsaAnswerDTO.setUserId(user.getUserId());
+			uid_answerToVsaAnswerDtoMap.put(uid_answer, vsaAnswerDTO);
+			
+			//find and store optionUid
+			for (QbOption option : qbQuestion.getQbOptions()) {
+			    for (AssessmentOptionAnswer optionAnswer : questionResult.getOptionAnswers()) {
+				if (optionAnswer.getAnswerBoolean()
+					&& (optionAnswer.getOptionUid().equals(option.getUid()))) {
+				    Long optionUid = option.getUid();
+				    vsaAnswerDTO.setQbOptionUid(optionUid);
+				    break;
+				}
+			    }
+			}
+		    }
+		    
+		    ConfidenceLevelDTO confidenceLevelDto = new ConfidenceLevelDTO();
+		    confidenceLevelDto.setUserId(user.getUserId().intValue());
+		    String userName = StringUtils.isBlank(user.getFirstName())
+			    && StringUtils.isBlank(user.getLastName()) ? user.getLoginName()
+				    : user.getFirstName() + " " + user.getLastName();
+		    confidenceLevelDto.setUserName(userName);
+		    confidenceLevelDto.setPortraitUuid(portraitUuid);
+		    confidenceLevelDto.setLevel(questionResult.getConfidenceLevel());
+
+		    vsaAnswerDTO.getConfidenceLevels().add(confidenceLevelDto);		    
+		}
+	    }
+
+	}
+
+	return uid_answerToVsaAnswerDtoMap.values();
+    }
+
     @Override
     public void forceCompleteUser(Long toolSessionId, User user) {
 	Long userId = user.getUserId().longValue();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -r3004d09a72bb86597e40ef2277e1e158b6b62b0a -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 3004d09a72bb86597e40ef2277e1e158b6b62b0a)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -29,11 +29,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
-import org.lamsfoundation.lams.qb.model.QbOption;
-import org.lamsfoundation.lams.qb.model.QbQuestion;
-import org.lamsfoundation.lams.qb.model.QbQuestionUnit;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.LeaderResultsDTO;
@@ -53,9 +49,9 @@
 import org.lamsfoundation.lams.util.ExcelCell;
 
 /**
+ * Interface that defines the contract that all ShareAssessment service provider must follow.
+ * 
  * @author Andrey Balan
- *
- *         Interface that defines the contract that all ShareAssessment service provider must follow.
  */
 public interface IAssessmentService extends ICommonToolService {
 
@@ -87,8 +83,6 @@
     void copyAnswersFromLeader(AssessmentUser user, AssessmentUser leader)
 	    throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException;
 
-    List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId);
-
     /**
      * Stores date when user has started activity with time limit.
      *
@@ -430,6 +424,9 @@
      * @return
      */
     QuestionSummary getQuestionSummary(Long contentId, Long questionUid);
+    
+    void allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid,
+	    Long questionResultUid);
 
     /**
      * For export purposes
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
===================================================================
diff -u -r2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java	(.../AssessmentEscapeUtils.java)	(revision 2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java	(.../AssessmentEscapeUtils.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -159,7 +159,7 @@
 		    break;
 
 		case QbQuestion.TYPE_NUMERICAL:
-		case QbQuestion.TYPE_SHORT_ANSWER:
+		case QbQuestion.TYPE_VERY_SHORT_ANSWERS:
 		case QbQuestion.TYPE_ESSAY:
 		    responseStr.append(questionResult.getAnswer());
 		    break;
@@ -243,7 +243,7 @@
 		    return questionResult.getAnswer();
 		case QbQuestion.TYPE_ORDERING:
 		    return AssessmentEscapeUtils.getOptionResponse(questionResult, QbQuestion.TYPE_ORDERING);
-		case QbQuestion.TYPE_SHORT_ANSWER:
+		case QbQuestion.TYPE_VERY_SHORT_ANSWERS:
 		    return questionResult.getAnswer();
 		case QbQuestion.TYPE_TRUE_FALSE:
 		    return questionResult.getAnswerBoolean();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r3004d09a72bb86597e40ef2277e1e158b6b62b0a -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 3004d09a72bb86597e40ef2277e1e158b6b62b0a)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -40,6 +40,7 @@
 import java.util.SortedSet;
 import java.util.TimeZone;
 import java.util.TreeSet;
+import java.util.regex.Pattern;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -49,6 +50,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.outcome.Outcome;
+import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
@@ -70,6 +73,8 @@
 import org.lamsfoundation.lams.tool.assessment.web.form.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.AlphanumComparator;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.ValidationUtil;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -85,6 +90,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -698,7 +704,40 @@
 
 	service.launchTimeLimit(assessmentUid, userId);
     }
+    
+    @RequestMapping("/vsaAutocomplete")
+    @ResponseBody
+    public String vsaAutocomplete(HttpServletRequest request, HttpServletResponse response) {
+	String userAnswer = WebUtil.readStrParam(request, "term", true);
+	Long questionUid = WebUtil.readLongParam(request, AssessmentConstants.PARAM_QUESTION_UID);
+	AssessmentQuestion question = service.getAssessmentQuestionByUid(questionUid);
+	QbQuestion qbQuestion = question.getQbQuestion();
+	
+	ArrayNode responseJSON = JsonNodeFactory.instance.arrayNode();
+	if (StringUtils.isNotBlank(userAnswer)) {
+	    userAnswer = userAnswer.trim();
+	    userAnswer = qbQuestion.isCaseSensitive() ? userAnswer : userAnswer.toLowerCase();
+	    
+	    for (QbOption option : qbQuestion.getQbOptions()) {
 
+		//filter out options not starting with 'term' and containing '*'		
+		String optionTitle = qbQuestion.isCaseSensitive() ? option.getName() : option.getName().toLowerCase();
+		int i = 0;
+		for (String optionAnswer : optionTitle.split("\\r\\n")) {
+		    if (optionAnswer.startsWith(userAnswer) && !optionAnswer.contains("*")) {
+			ObjectNode optionJSON = JsonNodeFactory.instance.objectNode();
+			String originalOptionAnswer = option.getName().split("\\r\\n")[i];
+			optionJSON.put("label", originalOptionAnswer);
+			responseJSON.add(optionJSON);
+		    }
+		    i++;
+		}
+	    }
+	}
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
     /**
      * Display empty reflection form.
      */
@@ -813,7 +852,7 @@
 		    optionDto.setAnswerInt(answerInt);
 		}
 
-	    } else if (questionType == QbQuestion.TYPE_SHORT_ANSWER) {
+	    } else if (questionType == QbQuestion.TYPE_VERY_SHORT_ANSWERS) {
 		String answer = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
 		questionDto.setAnswer(answer);
 
@@ -913,7 +952,7 @@
 			    isAnswered |= optionDto.getAnswerInt() != 0;
 			}
 
-		    } else if ((questionType == QbQuestion.TYPE_SHORT_ANSWER)
+		    } else if ((questionType == QbQuestion.TYPE_VERY_SHORT_ANSWERS)
 			    || (questionType == QbQuestion.TYPE_NUMERICAL)
 			    || (questionType == QbQuestion.TYPE_TRUE_FALSE)
 			    || (questionType == QbQuestion.TYPE_ESSAY)) {
@@ -1013,7 +1052,7 @@
 			    }
 
 			    // required for showing right/wrong answers icons on results page correctly
-			    if ((questionDto.getType() == QbQuestion.TYPE_SHORT_ANSWER
+			    if ((questionDto.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS
 				    || questionDto.getType() == QbQuestion.TYPE_NUMERICAL)
 				    && questionResult.getQbOption() != null) {
 				boolean isAnsweredCorrectly = false;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -r4dfbbc90e3d414eaf3f4282a3a38b4ec741384d7 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 4dfbbc90e3d414eaf3f4282a3a38b4ec741384d7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -73,9 +73,12 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.util.HtmlUtils;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -188,6 +191,14 @@
 	request.setAttribute(AssessmentConstants.ATTR_QUESTION_SUMMARY, questionSummary);
 	return "pages/monitoring/parts/questionsummary";
     }
+    
+    @RequestMapping("/allocateUserAnswer")
+    @ResponseStatus(HttpStatus.OK)
+    public void allocateUserAnswer(HttpServletRequest request, HttpServletResponse response,
+	    @RequestParam Long questionUid, @RequestParam Long targetOptionUid, @RequestParam Long previousOptionUid,
+	    @RequestParam Long questionResultUid) {
+	service.allocateAnswerToOption(questionUid, targetOptionUid, previousOptionUid, questionResultUid);
+    }
 
     @RequestMapping("/userSummary")
     public String userSummary(HttpServletRequest request, HttpServletResponse response) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -250,7 +250,7 @@
 		    return sb.toString();
 
 		case QbQuestion.TYPE_MULTIPLE_CHOICE:
-		case QbQuestion.TYPE_SHORT_ANSWER:
+		case QbQuestion.TYPE_VERY_SHORT_ANSWERS:
 		    for (OptionDTO optionDto : questionDto.getOptionDtos()) {
 			if (optionDto.getMaxMark() == 1f) {
 			    return optionDto.getName();
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -1,35 +1,35 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL /></c:set>
+<%-- param has higher level for request attribute --%>
+<c:if test="${not empty param.sessionMapID}">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+</c:if>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
+<c:set var="assessment" value="${sessionMap.assessment}" />
+<c:set var="pageNumber" value="${sessionMap.pageNumber}" />
+<c:set var="isResubmitAllowed" value="${sessionMap.isResubmitAllowed}" />
+<c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
+<c:set var="isTimeLimitEnabled" value="${hasEditRight && assessment.getTimeLimit() != 0}" />
+<c:set var="secondsLeft" value="${sessionMap.secondsLeft}"/>
+<c:set var="result" value="${sessionMap.assessmentResult}" />
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
+<c:set var="isLeadershipEnabled" value="${assessment.useSelectLeaderToolOuput}"/>
+<!-- hasEditRight=${hasEditRight} -->
 
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
-
-	<%-- param has higher level for request attribute --%>
-	<c:if test="${not empty param.sessionMapID}">
-		<c:set var="sessionMapID" value="${param.sessionMapID}" />
-	</c:if>
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-	<c:set var="mode" value="${sessionMap.mode}" />
-	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
-	<c:set var="assessment" value="${sessionMap.assessment}" />
-	<c:set var="pageNumber" value="${sessionMap.pageNumber}" />
-	<c:set var="isResubmitAllowed" value="${sessionMap.isResubmitAllowed}" />
-	<c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
-	<c:set var="isTimeLimitEnabled" value="${hasEditRight && assessment.getTimeLimit() != 0}" />
-	<c:set var="secondsLeft" value="${sessionMap.secondsLeft}"/>
-	<c:set var="result" value="${sessionMap.assessmentResult}" />
-	<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
-	<c:set var="isLeadershipEnabled" value="${assessment.useSelectLeaderToolOuput}"/>
-		
-	<!-- hasEditRight=${hasEditRight} -->
 	
+	<link rel="stylesheet" type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" />
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.jgrowl.css" />
 	<link rel="stylesheet" type="text/css" href="${lams}css/bootstrap-slider.css" />
 
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
@@ -88,7 +88,15 @@
 			        });
 			    });
 			}
-			
+
+			//autocomplete for VSA
+			$('.ui-autocomplete-input').each(function(){
+				$(this).autocomplete({
+					'source' : '<c:url value="/learning/vsaAutocomplete.do"/>?questionUid=' + $(this).data("question-uid"),
+					'delay'  : 500,
+					'minLength' : 3
+				});
+			});
 		});
 		
 		function countHedgeQuestionSelectTotal(questionIndex) {
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -35,7 +35,7 @@
 						<%@ include file="matchingpairs.jsp"%>
 					</c:when>
 					<c:when test="${question.type == 3}">
-						<%@ include file="shortanswer.jsp"%>
+						<%@ include file="vsa.jsp"%>
 					</c:when>
 					<c:when test="${question.type == 4}">
 						<%@ include file="numerical.jsp"%>
Fisheye: Tag e8a7110708b15579af2c6b31ac52a6da427fef6d refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/learning/parts/vsa.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/parts/vsa.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/parts/vsa.jsp	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,19 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div class="question-type">
+	<fmt:message key="label.learning.short.answer.answer" />
+</div>
+
+<div class="table-responsive">
+	<table class="table table-hover table-condensed">
+		<tr>
+			<td>
+				<input type="text" autocomplete="off" name="question${status.index}" class="form-control 
+					<c:if test="${question.autocompleteEnabled}">ui-autocomplete-input</c:if>" 
+					value="<c:out value='${question.answer}' />" data-question-uid="${question.uid}"  
+					<c:if test="${!hasEditRight}">disabled="disabled"</c:if>
+				/>
+			</td>	
+		</tr>
+	</table>
+</div>
Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -32,7 +32,7 @@
 					<%@ include file="matchingpairs.jsp"%>
 				</c:when>
 				<c:when test="${question.type == 3}">
-					<%@ include file="shortanswer.jsp"%>
+					<%@ include file="vsa.jsp"%>
 				</c:when>
 				<c:when test="${question.type == 4}">
 					<%@ include file="numerical.jsp"%>
Fisheye: Tag e8a7110708b15579af2c6b31ac52a6da427fef6d refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/learning/results/shortanswer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/learning/results/vsa.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/results/vsa.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/results/vsa.jsp	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,33 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div class="question-type">
+	<fmt:message key="label.learning.short.answer.answer" />
+</div>
+
+<div class="table-responsive">
+	<table class="table table-hover table-condensed">
+		<tr>
+			<td class="complete-item-gif">
+				<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
+					<i class="fa fa-check text-success"></i>
+				</c:if>			
+				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
+					<i class="fa fa-times text-danger"></i>
+				</c:if>	
+			</td>
+			
+			<td>
+				<input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answer}' />"  class="form-control" 
+					disabled="disabled"
+				/>	
+			</td>	
+		</tr>
+	</table>
+</div>	
+
+<c:if test="${assessment.allowQuestionFeedback && (question.questionFeedback != null)}">
+	<div class="feedback">
+		<c:out value="${question.questionFeedback}" escapeXml="false" />
+	</div>
+</c:if>	
+
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -1,22 +1,29 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="questionDto" value="${questionSummary.questionDto}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="assessment" value="${sessionMap.assessment}"/>
+<c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
+<% pageContext.setAttribute("newLineChar", "\r\n"); %>
 
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-		
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-		<c:set var="assessment" value="${sessionMap.assessment}"/>
-		<c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
-		
 		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet">
+		<style>
+			.sortable-on {
+				background: lightgoldenrodyellow;
+    			min-height: 110px;
+    			padding: 10px;
+			}
+		</style>
 		
 		<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.confidence-level-formattter.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
+	 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/Sortable.js"></script>
   	    <script>
   	    	var isEdited = false;
   	    	var previousCellValue = "";
@@ -118,6 +125,43 @@
 	  		        }
 	  			});
 	  			setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
+
+	  		    //init options sorting feature
+	  			$('.sortable-on').each(function() {
+	  			    new Sortable($(this)[0], {
+	  			    	group: 'shared',
+	  				    animation: 150,
+	  				    //ghostClass: 'sortable-placeholder',
+	  				    //direction: 'vertical',
+	  					onStart: function (evt) {
+	  						//stop answers' hover effect, once element dragging started
+	  						//$("#option-table").removeClass("hover-active");
+	  					},
+	  					onEnd: function (evt) {
+	  				        $.ajax({
+	  				            url: '<c:url value="/monitoring/allocateUserAnswer.do"/>',
+	  				            data: {
+	  				            	sessionMapID: "${sessionMapID}",
+	  				            	questionUid: ${questionDto.uid},
+	  				            	targetOptionUid: $(evt.to).data("option-uid"),
+	  				            	previousOptionUid: $(evt.from).data("option-uid"),
+	  				            	questionResultUid: $(evt.item).data("question-result-uid")
+	  						    },
+	  				            type: 'post'
+	  				       	});
+	  					},
+	  					store: {
+	  						set: function (sortable) {
+	  							//update all displayOrders in order to later save it as options' order
+	  							var order = sortable.toArray();
+	  							for (var i = 0; i < order.length; i++) {
+	  							    var optionIndex = order[i];
+	  							    $('input[name="optionDisplayOrder' + optionIndex + '"]').val(i+1);
+	  							}
+	  						}
+	  					}
+	  				});
+	  			});
 	  		});  	    	
 	  		
     		function refreshSummaryPage()  { 
@@ -154,7 +198,6 @@
                 
             <c:out value="${questionDto.question}" escapeXml="false"/>
 
-
             <div class="row"><div class="col-xs-12 col-sm-6">
             <h5><fmt:message key="label.question.options"/></h5>    
 			<table class="table table-condensed table-striped">
@@ -176,7 +219,6 @@
 						<c:out value="${questionDto.maxMark}" escapeXml="true"/>
 					</td>
 				</tr>
-					
 				<tr>
 					<td>
 						<fmt:message key="label.monitoring.question.summary.penalty" />:
@@ -188,15 +230,102 @@
 			</table>
             </div></div>
             
+            <!--history responses-->
             <h5><fmt:message key="label.monitoring.question.summary.history.responses" /></h5>
-			
-			<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
+			<c:forEach var="sessionDto" items="${sessionDtos}">
 				<div class="voffset20">
 					<table id="session${sessionDto.sessionId}"></table>
 					<div id="pager${sessionDto.sessionId}"></div>
 				</div>	
 			</c:forEach>
 			
+            <!--allocate responses-->
+			<c:if test="${questionDto.type == 3}">
+				<br><br>
+				
+				<div class="row">
+					<div class="col-sm-4 text-center">
+						<c:set var="option0" value="${questionDto.optionDtos.toArray()[0]}"/>
+						<h4>
+							<c:choose>
+								<c:when test="${questionSummary.tbl && option0.maxMark == 1}">
+									<i class="fa fa-check fa-lg text-success"></i> <fmt:message key="label.correct" />
+								</c:when>
+								<c:when test="${questionSummary.tbl && option0.maxMark == 0}">
+									<i class="fa fa-times fa-lg text-danger"></i>	<fmt:message key="label.incorrect" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.authoring.basic.option.grade"/>: ${option0.maxMark}
+								</c:otherwise>
+							</c:choose>
+						</h4>
+						
+						<fmt:message key="label.answer.alternatives" />: 
+						${fn:replace(option0.name, newLineChar, ', ')}
+						
+						<div class="list-group col sortable-on" data-option-uid="${option0.uid}"></div>	
+					</div>
+					
+					<div class="col-sm-4 text-center">
+		            	<h4><fmt:message key="label.answer.queue" /></h4>
+	            		(<fmt:message key="label.drag.and.drop" />)	
+	            		
+	            		<div class="list-group col sortable-on" data-option-uid="-1">
+		            		<c:forEach var="questionResult" items="${questionSummary.notAllocatedQuestionResults}">
+		            			<div class="list-group-item" data-question-result-uid="${questionResult.uid}">
+		            				<lams:Portrait userId="${questionResult.assessmentResult.user.userId}"/>&nbsp;
+		            				${questionResult.answer}
+		            			</div>
+		            		</c:forEach>
+	            		</div>		
+					</div>
+					
+					<div class="col-sm-4 text-center">
+						<c:set var="option1" value="${questionDto.optionDtos.toArray()[1]}"/>
+						<h4>
+							<c:choose>
+								<c:when test="${questionSummary.tbl && option1.maxMark == 1}">
+									<i class="fa fa-check fa-lg text-success"></i> <fmt:message key="label.correct" />
+								</c:when>
+								<c:when test="${questionSummary.tbl && option1.maxMark == 0}">
+									<i class="fa fa-times fa-lg text-danger"></i>	<fmt:message key="label.incorrect" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.authoring.basic.option.grade"/>: ${option1.maxMark}
+								</c:otherwise>
+							</c:choose>
+						</h4>
+						
+						<fmt:message key="label.answer.alternatives" />: 
+						${fn:replace(option1.name, newLineChar, ', ')}
+						
+						<div class="list-group col sortable-on" data-option-uid="${option1.uid}"></div>	
+					</div>
+				</div>
+				
+				<c:forEach var="optionDto" items="${questionDto.optionDtos}" begin="2" varStatus="status">
+				
+					<c:if test="${status.count % 3 == 0}">
+						<div class="row">
+					</c:if>
+				
+					<div class="col-sm-4 text-center">
+						<h4>
+							<fmt:message key="label.authoring.basic.option.grade"/>: ${optionDto.maxMark}
+						</h4>
+	
+						<fmt:message key="label.answer.alternatives" />: 
+						${fn:replace(optionDto.name, newLineChar, ', ')}
+						
+						<div class="list-group col sortable-on" data-option-uid="${optionDto.uid}"></div>	
+					</div>
+					
+					<c:if test="${status.count % 3 == 0 || status.last}">
+						</div>
+					</c:if>
+				</c:forEach>
+			</c:if>
+			
 			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-default btn-sm voffset10 pull-right">
 				<fmt:message key="label.close" /> 
 			</a>
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re7f6df71275535cf4af43f3ff4479a8c58e0be50 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e7f6df71275535cf4af43f3ff4479a8c58e0be50)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -207,7 +207,7 @@
 message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that a leader has already answered, then the mark for the whole group for the modified question will be deleted permanently as it is assumed that the question has changed.
 label.show.confidence.level  =Show confidence levels from the following activity
 label.no.confidence.levels.activities  =There are no activities with confidence levels to choose from.
-label.save.learning.design  =In order to select activity with  confidence levels please save your sequence first.
+label.save.learning.design  =In order to select activity with confidence levels or producing VSA answers please save your sequence first.
 label.change.marking.allocation  =Change marking allocation
 label.change.marking.allocation.warning  =Attention: changing marking allocation will affect the way marks get calculated.
 label.modify.default.marking  =Modify default marking
@@ -230,5 +230,24 @@
 outcome.authoring.existing.none  =none
 outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
 label.question.bank  =Question bank
+label.type.multiple.choice  =Multiple choice
+label.type.short.answer  =Very short answers
 
-#======= End labels: Exported 224 labels for en AU =====
+
+label.incorrect.answers  =Incorrect answers
+label.correct.answers  =Correct answers
+label.option.feedback  =Feedback
+label.answer.required  =Answer required?
+label.no.case.unimportant  =No, case is unimportant
+label.yes.case.must.match  =Yes, case must match
+label.case.sensitivity  =Case sensitivity
+label.autocomplete.as.student  =Autocomplete (as student types answer autocomplete with stemming from answers)
+label.general.feedback  =General feedback
+label.authoring.choice.field.required  =This field is required.
+label.error.two.answers.required  =You should provide at least one correct and one incorrect answer.
+label.settings  =Settings
+label.no.activities.provide.vsa.answers  =There are no activities that can provide VSA answers.
+label.show.vsa.answers  =Show VSA answers from the following activity
+label.type.your.group.answer  =Type your group answer
+label.button.submit  =Submit
+
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
diff -u -r23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision 23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -30,7 +30,7 @@
 
     public static final int COMPLETED = 1;
 
-    public static final int INITIAL_OPTIONS_NUMBER = 4;
+    public static final int INITIAL_MCQ_OPTIONS_NUMBER = 4;
 
     // for action forward name
     public static final String SUCCESS = "success";
@@ -83,22 +83,10 @@
 
     public static final String ATTR_ITEM_DESCRIPTION_PREFIX = "itemDescription";
 
-    public static final String ATTR_OPTION_CORRECT = "optionCorrect";
-
     public static final String ATTR_ITEM_COUNT = "itemCount";
 
     public static final String ATTR_GROUP_USERS = "groupUsers";
 
-    public static final String ATTR_OPTION_LIST = "optionList";
-
-    public static final String ATTR_OPTION_COUNT = "optionCount";
-
-    public static final String ATTR_OPTION_DESCRIPTION_PREFIX = "optionDescription";
-
-    public static final String ATTR_OPTION_ORDER_ID_PREFIX = "optionOrderId";
-
-    public static final String ATTR_OPTION_UID_PREFIX = "optionUid";
-
     public static final String ATTR_DELETED_ITEM_LIST = "deleteItemList";
 
     public static final String ATTR_DELETED_OPTION_LIST = "deleteOptionList";
@@ -183,7 +171,9 @@
 
     public static final String ATTR_OPTION_UIDS = "optionUids";
     
-    public static final String ATTR_CONFIDENCE_LEVELS_ACTIVITIES = "confidenceLevelsActivities";
+    public static final String ATTR_ACTIVITIES_PROVIDING_CONFIDENCE_LEVELS = "activitiesProvidingConfidenceLevels";
+    
+    public static final String ATTR_ACTIVITIES_PROVIDING_VSA_ANSWERS = "activitiesProvidingVsaAnswers";
 
     public static final String LEARNER_MARK = "learner.mark";
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
===================================================================
diff -u -r23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java	(.../ScratchieAnswerVisitDAO.java)	(revision 23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java	(.../ScratchieAnswerVisitDAO.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -29,9 +29,19 @@
 
 public interface ScratchieAnswerVisitDAO extends DAO {
 
+    /**
+     * Get log for MCQ question.
+     */
     ScratchieAnswerVisitLog getLog(Long optionUid, Long itemUid, Long sessionId);
+  
+    /**
+     * Get log for VSA question.
+     */
+    ScratchieAnswerVisitLog getLog(Long sessionId, Long itemUid, String answer);
 
     int getLogCountTotal(Long sessionId);
+    
+    int getLogCountPerItem(Long sessionId, Long itemUid);
 
     List<ScratchieAnswerVisitLog> getLogsBySessionAndItem(Long sessionId, Long itemUid);
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
===================================================================
diff -u -r23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java	(.../ScratchieAnswerVisitDAOHibernate.java)	(revision 23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java	(.../ScratchieAnswerVisitDAOHibernate.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -33,35 +33,59 @@
 @Repository
 public class ScratchieAnswerVisitDAOHibernate extends LAMSBaseDAO implements ScratchieAnswerVisitDAO {
 
-    private static final String FIND_BY_SESSION_AND_OPTION = "from " + ScratchieAnswerVisitLog.class.getName()
-	    + " as r where r.sessionId = ? and r.qbOption.uid=? and r.qbToolQuestion.uid = ?";
-
     private static final String FIND_BY_SESSION_AND_ITEM = "from " + ScratchieAnswerVisitLog.class.getName()
 	    + " as r where r.sessionId=? and r.qbToolQuestion.uid = ?  order by r.accessDate asc";
 
     private static final String FIND_BY_SESSION = "from " + ScratchieAnswerVisitLog.class.getName()
 	    + " as r where r.sessionId=? order by r.accessDate asc";
 
-    private static final String FIND_VIEW_COUNT_BY_SESSION = "select count(*) from "
+    private static final String FIND_COUNT_BY_SESSION = "select count(*) from "
 	    + ScratchieAnswerVisitLog.class.getName() + " as r where  r.sessionId=?";
+    
+    private static final String FIND_COUNT_BY_SESSION_AND_ITEM = "select count(*) from "
+	    + ScratchieAnswerVisitLog.class.getName() + " as r where  r.sessionId=? and r.qbToolQuestion.uid = ?";
 
     @Override
     public ScratchieAnswerVisitLog getLog(Long optionUid, Long itemUid, Long sessionId) {
+	final String FIND_BY_SESSION_AND_OPTION = "from " + ScratchieAnswerVisitLog.class.getName()
+		+ " as r where r.sessionId = ? and r.qbToolQuestion.uid = ? and r.qbOption.uid=?";
+	
 	List list = doFind(FIND_BY_SESSION_AND_OPTION, new Object[] { sessionId, itemUid, optionUid });
 	if (list == null || list.size() == 0) {
 	    return null;
 	}
 	return (ScratchieAnswerVisitLog) list.get(0);
     }
+    
+    @Override
+    public ScratchieAnswerVisitLog getLog(Long sessionId, Long itemUid, String answer) {
+	final String FIND_BY_SESSION_AND_ANSWER = "from " + ScratchieAnswerVisitLog.class.getName()
+		+ " as r where r.sessionId = ? and r.qbToolQuestion.uid = ? and r.answer=?";
+	
+	List list = doFind(FIND_BY_SESSION_AND_ANSWER, new Object[] { sessionId, itemUid, answer });
+	if (list == null || list.size() == 0) {
+	    return null;
+	}
+	return (ScratchieAnswerVisitLog) list.get(0);
+    }
 
     @Override
     public int getLogCountTotal(Long sessionId) {
-	List list = doFind(FIND_VIEW_COUNT_BY_SESSION, new Object[] { sessionId });
+	List list = doFind(FIND_COUNT_BY_SESSION, new Object[] { sessionId });
 	if (list == null || list.size() == 0) {
 	    return 0;
 	}
 	return ((Number) list.get(0)).intValue();
     }
+    
+    @Override
+    public int getLogCountPerItem(Long sessionId, Long itemUid) {
+	List list = doFind(FIND_COUNT_BY_SESSION_AND_ITEM, new Object[] { sessionId, itemUid });
+	if (list == null || list.size() == 0) {
+	    return 0;
+	}
+	return ((Number) list.get(0)).intValue();
+    }
 
     @SuppressWarnings("unchecked")
     @Override
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
===================================================================
diff -u -r23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java	(.../GroupSummary.java)	(revision 23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java	(.../GroupSummary.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -38,7 +38,7 @@
 
     private Collection<ScratchieUser> users;
     private Collection<ScratchieItemDTO> itemDtos;
-    private Collection<QbOptionDTO> optionDtos;
+    private Collection<OptionDTO> optionDtos;
 
     public GroupSummary() {
     }
@@ -114,11 +114,11 @@
 	this.users = users;
     }
 
-    public Collection<QbOptionDTO> getOptionDtos() {
+    public Collection<OptionDTO> getOptionDtos() {
 	return optionDtos;
     }
 
-    public void setOptionDtos(Collection<QbOptionDTO> optionDtos) {
+    public void setOptionDtos(Collection<OptionDTO> optionDtos) {
 	this.optionDtos = optionDtos;
     }
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/OptionDTO.java
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/OptionDTO.java	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/OptionDTO.java	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,150 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.scratchie.dto;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
+import org.lamsfoundation.lams.qb.model.QbOption;
+import org.lamsfoundation.lams.util.HashUtil;
+
+/**
+ * Tool may contain several questions. Which in turn contain options.
+ *
+ * @author Andrey Balan
+ */
+public class OptionDTO implements Comparable<OptionDTO> {
+    private boolean scratched;
+    private int attemptOrder;
+    private int[] attempts;
+    //VSA questions doesn't have confidenceLevelDto.qbOptionUid
+    private List<ConfidenceLevelDTO> confidenceLevelDtos;
+    
+    //****for MCQ questions***
+    private QbOption qbOption;
+    
+    //****for VSA questions***
+    private Long qbQuestionUid;
+    private String answer;
+    private int answerHash;
+    boolean correct;
+    private Long userId;
+
+    public OptionDTO() {
+	//init confidenceLevelDtos list
+	this.confidenceLevelDtos = new LinkedList<>();
+    }
+
+    @Override
+    public int compareTo(OptionDTO o) {
+	return qbOption == null ? this.answer.compareTo(o.answer) : this.qbOption.compareTo(o.qbOption);
+    }
+
+    public QbOption getQbOption() {
+	return qbOption;
+    }
+
+    public void setQbOption(QbOption qbOption) {
+	this.qbOption = qbOption;
+    }
+    
+    public void setQbQuestionUid(Long qbQuestionUid) {
+	this.qbQuestionUid = qbQuestionUid;
+    }
+
+    public Long getQbQuestionUid() {
+	return this.qbQuestionUid;
+    }
+    
+    public void setAnswer(String answer) {
+	this.answer = answer;
+	this.answerHash = answer.hashCode();
+    }
+
+    public String getAnswer() {
+	return this.answer;
+    }
+    
+    public void setAnswerHash(int answerHash) {
+	this.answerHash = answerHash;
+    }
+
+    public int getAnswerHash() {
+	return this.answerHash;
+    }
+    
+    public boolean isCorrect() {
+	return this.correct;
+    }
+
+    public void setCorrect(boolean correct) {
+	this.correct = correct;
+    }
+    
+    public void setUserId(Long userId) {
+	this.userId = userId;
+    }
+
+    public Long getUserId() {
+	return this.userId;
+    }
+
+    public void setScratched(boolean complete) {
+	this.scratched = complete;
+    }
+
+    public boolean isScratched() {
+	return scratched;
+    }
+
+    /**
+     * @return in which order the student selected it
+     */
+    public int getAttemptOrder() {
+	return attemptOrder;
+    }
+
+    public void setAttemptOrder(int attemptOrder) {
+	this.attemptOrder = attemptOrder;
+    }
+
+    /**
+     * Used for item summary page in monitor
+     */
+    public int[] getAttempts() {
+	return attempts;
+    }
+
+    public void setAttempts(int[] attempts) {
+	this.attempts = attempts;
+    }
+
+    public List<ConfidenceLevelDTO> getConfidenceLevelDtos() {
+	return confidenceLevelDtos;
+    }
+
+    public void setConfidenceLevelDtos(List<ConfidenceLevelDTO> confidenceLevelDtos) {
+	this.confidenceLevelDtos = confidenceLevelDtos;
+    }
+}
\ No newline at end of file
Fisheye: Tag e8a7110708b15579af2c6b31ac52a6da427fef6d refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/QbOptionDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
===================================================================
diff -u -r23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java	(.../ScratchieItemDTO.java)	(revision 23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java	(.../ScratchieItemDTO.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -12,7 +12,7 @@
 
     private Long uid;
     private String title;
-    private List<QbOptionDTO> optionDtos;
+    private List<OptionDTO> optionDtos;
     private boolean unraveledOnFirstAttempt;
     private int userMark;
     private int userAttempts;
@@ -45,11 +45,11 @@
 	this.title = title;
     }
 
-    public List<QbOptionDTO> getOptionDtos() {
+    public List<OptionDTO> getOptionDtos() {
 	return optionDtos;
     }
 
-    public void setOptionDtos(List<QbOptionDTO> optionDtos) {
+    public void setOptionDtos(List<OptionDTO> optionDtos) {
 	this.optionDtos = optionDtos;
     }
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
diff -u -r5085f565abf2755321060bb008683befc014dbb3 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 5085f565abf2755321060bb008683befc014dbb3)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -40,6 +40,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
 
 /**
  * Scratchie
@@ -99,6 +100,10 @@
 
     @Column(name = "confidence_levels_activity_uiid")
     private Integer confidenceLevelsActivityUiid;
+    
+    
+    @Column(name = "activity_uuid_providing_vsa_answers")
+    private Integer activityUiidProvidingVsaAnswers;
 
     //overwrites default preset marks stored as admin config setting
     @Column(name = "preset_marks")
@@ -378,8 +383,33 @@
     public void setConfidenceLevelsActivityUiid(Integer confidenceLevelsActivityUiid) {
 	this.confidenceLevelsActivityUiid = confidenceLevelsActivityUiid;
     }
+    
+    public boolean isAnswersFetchingEnabledAndVsaQuestionsAvailable() {
+	//check Scratchie contains VSA questions
+	boolean hasVsaQuestion = false;
+	for (ScratchieItem item : scratchieItems) {
+	    hasVsaQuestion |= QbQuestion.TYPE_VERY_SHORT_ANSWERS == item.getQbQuestion().getType();
+	}
+	
+	return activityUiidProvidingVsaAnswers != null && hasVsaQuestion;
+    }
+    
+    /**
+     * @return which preceding activity should be queried for VSA answers
+     */
+    public Integer getActivityUiidProvidingVsaAnswers() {
+	return activityUiidProvidingVsaAnswers;
+    }
 
     /**
+     * @param activityUiidProvidingVsaAnswers
+     *            preceding activity that should be queried for VSA answers
+     */
+    public void setActivityUiidProvidingVsaAnswers(Integer activityUiidProvidingVsaAnswers) {
+	this.activityUiidProvidingVsaAnswers = activityUiidProvidingVsaAnswers;
+    }
+
+    /**
      * This property holds value that can overwrite default preset marks stored in admin config setting. It can be null
      * and therefore ScratchieService.getPresetMarks() method should be used instead when calculating actual marks.
      *
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
===================================================================
diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java	(.../ScratchieItem.java)	(revision 06d090eefddaafa108bcd8614d47d3d92f946210)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java	(.../ScratchieItem.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -34,9 +34,9 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.qb.model.QbOption;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.qb.model.QbToolQuestion;
-import org.lamsfoundation.lams.qb.service.IQbService;
-import org.lamsfoundation.lams.tool.scratchie.dto.QbOptionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.OptionDTO;
 
 /**
  * Tool may contain several questions. Which in turn contain optionDtos.
@@ -58,7 +58,7 @@
     @Transient
     private String burningQuestion;
     @Transient
-    private List<QbOptionDTO> optionDtos = null;
+    private List<OptionDTO> optionDtos = null;
 
     @Override
     public Object clone() {
@@ -72,19 +72,22 @@
 	return item;
     }
 
-    public List<QbOptionDTO> getOptionDtos() {
+    public List<OptionDTO> getOptionDtos() {
 	if (optionDtos == null) {
 	    optionDtos = new LinkedList<>();
-	    for (QbOption option : qbQuestion.getQbOptions()) {
-		QbOptionDTO answer = new QbOptionDTO();
-		answer.setQbOption(option);
-		optionDtos.add(answer);
+	    
+	    if (QbQuestion.TYPE_MULTIPLE_CHOICE == this.qbQuestion.getType()) {
+		for (QbOption option : qbQuestion.getQbOptions()) {
+		    OptionDTO answer = new OptionDTO();
+		    answer.setQbOption(option);
+		    optionDtos.add(answer);
+		}
 	    }
 	}
 	return optionDtos;
     }
 
-    public void setOptionDtos(List<QbOptionDTO> optionDtos) {
+    public void setOptionDtos(List<OptionDTO> optionDtos) {
 	this.optionDtos = optionDtos;
     }
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 06d090eefddaafa108bcd8614d47d3d92f946210)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -73,6 +73,17 @@
      */
     void populateItemsWithConfidenceLevels(Long userId, Long toolSessionId, Integer confidenceLevelsActivityUiid,
 	    Collection<ScratchieItem> items);
+    
+//    /**
+//     * Populate scratchie items with the VSA answers from the Assessment activity specified in author
+//     *
+//     * @param userId
+//     * @param toolSessionId
+//     * @param confidenceLevelsActivityUiid
+//     * @param items
+//     */
+//    void populateItemsWithVsaAnswers(Long userId, Long toolSessionId, Integer activityUiidProvidingVsaAnswers,
+//	    Collection<ScratchieItem> items);
 
     /**
      * Returns all activities that precede specified activity and produce confidence levels.
@@ -81,9 +92,18 @@
      *            toolContentId of the specified activity
      * @return
      */
-    Set<ToolActivity> getPrecedingConfidenceLevelsActivities(Long toolContentId);
-
+    Set<ToolActivity> getActivitiesProvidingConfidenceLevels(Long toolContentId);
+    
     /**
+     * Returns all activities that precede specified activity and produce VSA answers (only Assessments at the moment).
+     *
+     * @param toolContentId
+     *            toolContentId of the specified activity
+     * @return
+     */
+    Set<ToolActivity> getActivitiesProvidingVsaAnswers(Long toolContentId);
+    
+    /**
      * Set specified user as a leader. Also the previous leader (if any) is marked as non-leader.
      *
      * @param userId
@@ -228,31 +248,27 @@
     void getScratchesOrder(Collection<ScratchieItem> items, Long toolSessionId);
 
     /**
-     * Fill in scratchieItems with information about whether they were unraveled; and options with information on their
+     * First, prepares all items and options (incl. getting VSA answers from Assessment for VSA question types). Second,
+     * fills scratchieItems with information whether they were unraveled; and options whether they were
      * scratched.
      *
      * @param scratchieItemList
-     * @param item
-     *            item parameter is optional. In case it's provided - these item collection is used instead of quering
-     *            DB
      */
     Collection<ScratchieItem> getItemsWithIndicatedScratches(Long toolSessionId);
+    
+    boolean isItemUnraveledByAnswers(ScratchieItem item, List<String> userAnswers);
 
     /**
-     * The same as getItemsWithIndicatedScratches(Long toolSessionId), but items are provided as parameter and not
-     * queried from DB.
-     *
-     * @param scratchieItemList
-     * @param item
-     *            this item collection is used instead of quering DB
-     */
-    Collection<ScratchieItem> getItemsWithIndicatedScratches(Long toolSessionId, Collection<ScratchieItem> items);
-
-    /**
      * Leader has scratched the specified answer. Will store this scratch for all users in his group. It will also
      * update all the marks.
      */
     void recordItemScratched(Long toolSessionId, Long itemUid, Long scratchieItemUid);
+    
+    /**
+     * Leader has left this answer. We will store this answer for all users in his group. It will also
+     * update all the marks.
+     */
+    void recordVsaAnswer(Long sessionId, Long itemUid, String answer);
 
     /**
      * Recalculate mark for leader and sets it to all members of a group
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
===================================================================
diff -u -rbed43f31ad918bbd7f19f6db56fc90fcffcc37bd -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java	(.../ScratchieImportContentVersionFilter.java)	(revision bed43f31ad918bbd7f19f6db56fc90fcffcc37bd)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java	(.../ScratchieImportContentVersionFilter.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -33,7 +33,7 @@
 
 import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
 import org.lamsfoundation.lams.qb.QbUtils;
-import org.lamsfoundation.lams.tool.scratchie.dto.QbOptionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.OptionDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
@@ -60,7 +60,7 @@
 
 	this.removeField(Scratchie.class, "createdBy");
 
-	this.removeField(QbOptionDTO.class, "scratchieItem");
+	this.removeField(OptionDTO.class, "scratchieItem");
 
 	this.addField(ScratchieSession.class, "mark", "0");
 	this.addField(ScratchieSession.class, "scratchingFinished", "0");
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -rbed43f31ad918bbd7f19f6db56fc90fcffcc37bd -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision bed43f31ad918bbd7f19f6db56fc90fcffcc37bd)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -41,12 +41,14 @@
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeSet;
+import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
+import org.lamsfoundation.lams.confidencelevel.VsaAnswerDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
@@ -84,7 +86,7 @@
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.dto.LeaderResultsDTO;
-import org.lamsfoundation.lams.tool.scratchie.dto.QbOptionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.OptionDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.ScratchieItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
@@ -278,17 +280,17 @@
 	for (ScratchieItem item : items) {
 
 	    //init options' confidenceLevelDtos list
-	    for (QbOptionDTO optionDto : item.getOptionDtos()) {
-		LinkedList<ConfidenceLevelDTO> confidenceLevelDtosTemp = new LinkedList<>();
-		optionDto.setConfidenceLevelDtos(confidenceLevelDtosTemp);
-	    }
+//	    for (OptionDTO optionDto : item.getOptionDtos()) {
+//		LinkedList<ConfidenceLevelDTO> confidenceLevelDtosTemp = new LinkedList<>();
+//		optionDto.setConfidenceLevelDtos(confidenceLevelDtosTemp);
+//	    }
 
-	    //find according QbQuestion
+	    //find corresponding QbQuestion
 	    for (ConfidenceLevelDTO confidenceLevelDto : confidenceLevelDtos) {
 		if (item.getQbQuestion().getUid().equals(confidenceLevelDto.getQbQuestionUid())) {
 
-		    //find according option
-		    for (QbOptionDTO option : item.getOptionDtos()) {
+		    //find corresponding QbOption
+		    for (OptionDTO option : item.getOptionDtos()) {
 			if (option.getQbOption().getUid().equals(confidenceLevelDto.getQbOptionUid())) {
 			    option.getConfidenceLevelDtos().add(confidenceLevelDto);
 			}
@@ -301,11 +303,16 @@
     }
 
     @Override
-    public Set<ToolActivity> getPrecedingConfidenceLevelsActivities(Long toolContentId) {
-	return toolService.getPrecedingConfidenceLevelsActivities(toolContentId);
+    public Set<ToolActivity> getActivitiesProvidingConfidenceLevels(Long toolContentId) {
+	return toolService.getActivitiesProvidingConfidenceLevels(toolContentId);
     }
 
     @Override
+    public Set<ToolActivity> getActivitiesProvidingVsaAnswers(Long toolContentId) {
+	return toolService.getActivitiesProvidingVsaAnswers(toolContentId);
+    }
+
+    @Override
     public ScratchieUser checkLeaderSelectToolForSessionLeader(ScratchieUser user, Long toolSessionId) {
 	if ((user == null) || (toolSessionId == null)) {
 	    return null;
@@ -439,9 +446,25 @@
 	    scratchieAnswerVisitDao.saveObject(log);
 	}
 
-	this.recalculateMarkForSession(sessionId, false);
+	recalculateMarkForSession(sessionId, false);
     }
+    
+    @Override
+    public void recordVsaAnswer(Long sessionId, Long itemUid, String answer) {
+	ScratchieAnswerVisitLog log = scratchieAnswerVisitDao.getLog(sessionId, itemUid, answer);
+	if (log == null) {
+	    log = new ScratchieAnswerVisitLog();
+	    log.setAnswer(answer);
+	    log.setSessionId(sessionId);
+	    QbToolQuestion qbToolQuestion = scratchieDao.find(QbToolQuestion.class, itemUid);
+	    log.setQbToolQuestion(qbToolQuestion);
+	    log.setAccessDate(new Timestamp(new Date().getTime()));
+	    scratchieAnswerVisitDao.saveObject(log);
+	}
 
+	recalculateMarkForSession(sessionId, false);
+    }
+
     @Override
     public void recalculateMarkForSession(Long sessionId, boolean isPropagateToGradebook) {
 	List<ScratchieAnswerVisitLog> userLogs = scratchieAnswerVisitDao.getLogsBySession(sessionId);
@@ -677,69 +700,171 @@
     @Override
     public void getScratchesOrder(Collection<ScratchieItem> items, Long sessionId) {
 	for (ScratchieItem item : items) {
+	    QbQuestion qbQuestion = item.getQbQuestion();
 	    List<ScratchieAnswerVisitLog> itemLogs = scratchieAnswerVisitDao.getLogsBySessionAndItem(sessionId,
 		    item.getUid());
+	    
+	    for (OptionDTO optionDto : item.getOptionDtos()) {
+		if (QbQuestion.TYPE_MULTIPLE_CHOICE == qbQuestion.getType()) {
+		    int attemptNumber;
+		    ScratchieAnswerVisitLog log = scratchieAnswerVisitDao.getLog(optionDto.getQbOption().getUid(),
+			    item.getUid(), sessionId);
+		    if (log == null) {
+			// -1 if there is no log
+			attemptNumber = -1;
+		    } else {
+			// adding 1 to start from 1.
+			attemptNumber = itemLogs.indexOf(log) + 1;
+		    }
+		    optionDto.setAttemptOrder(attemptNumber);
 
-	    for (QbOptionDTO optionDto : item.getOptionDtos()) {
-
-		int attemptNumber;
-		ScratchieAnswerVisitLog log = scratchieAnswerVisitDao.getLog(optionDto.getQbOption().getUid(),
-			item.getUid(), sessionId);
-		if (log == null) {
-		    // -1 if there is no log
-		    attemptNumber = -1;
+		//process VSA questions
 		} else {
-		    // adding 1 to start from 1.
-		    attemptNumber = itemLogs.indexOf(log) + 1;
+		    // -1 if there is no log
+		    int attemptNumber = -1;
+		    for (ScratchieAnswerVisitLog itemLog : itemLogs) {
+			if (itemLog.getQbToolQuestion().getUid().equals(item.getUid()) && itemLog.getAnswer() != null
+				&& itemLog.getAnswer().equals(optionDto.getAnswer())) {
+			    // adding 1 to start from 1.
+			    attemptNumber = itemLogs.indexOf(itemLog) + 1;
+			    break;
+			}
+		    }
+		    optionDto.setAttemptOrder(attemptNumber);
 		}
-
-		optionDto.setAttemptOrder(attemptNumber);
 	    }
+
 	}
     }
 
     @Override
     public Collection<ScratchieItem> getItemsWithIndicatedScratches(Long toolSessionId) {
-
-	Scratchie scratchie = this.getScratchieBySessionId(toolSessionId);
+	List<ScratchieAnswerVisitLog> userLogs = scratchieAnswerVisitDao.getLogsBySession(toolSessionId);
+	
+	Scratchie scratchie = getScratchieBySessionId(toolSessionId);
 	Set<ScratchieItem> items = new TreeSet<>(new ScratchieItemComparator());
 	items.addAll(scratchie.getScratchieItems());
-
-	return getItemsWithIndicatedScratches(toolSessionId, items);
-    }
-
-    @Override
-    public Collection<ScratchieItem> getItemsWithIndicatedScratches(Long toolSessionId,
-	    Collection<ScratchieItem> items) {
-	List<ScratchieAnswerVisitLog> userLogs = scratchieAnswerVisitDao.getLogsBySession(toolSessionId);
-
+	
+	//populate Scratchie items with VSA answers, entered by learners in Assessment tool
+	if (scratchie.isAnswersFetchingEnabledAndVsaQuestionsAvailable()) {
+	    for (ScratchieItem item : items) {
+		fillItemWithVsaOptionDtos(item, toolSessionId, scratchie, userLogs);
+	    }
+	}
+	
+	//mark scratched options
 	for (ScratchieItem item : items) {
-
-	    for (QbOptionDTO optionDto : item.getOptionDtos()) {
-
+	    for (OptionDTO optionDto : item.getOptionDtos()) {
+		
 		// find according log if it exists
-		ScratchieAnswerVisitLog log = null;
-		for (ScratchieAnswerVisitLog userLog : userLogs) {
-		    if (userLog.getQbOption().getUid().equals(optionDto.getQbOption().getUid())
-			    && userLog.getQbToolQuestion().getUid().equals(item.getUid())) {
-			log = userLog;
-			break;
+		boolean isScratched = false;
+		if (QbQuestion.TYPE_MULTIPLE_CHOICE == item.getQbQuestion().getType()) {
+		    for (ScratchieAnswerVisitLog userLog : userLogs) {
+			if (userLog.getQbToolQuestion().getUid().equals(item.getUid())
+				&& userLog.getQbOption().getUid().equals(optionDto.getQbOption().getUid())) {
+			    isScratched = true;
+			    break;
+			}
 		    }
-		}
-		if (log == null) {
-		    optionDto.setScratched(false);
+
+		//process VSA question
 		} else {
-		    optionDto.setScratched(true);
+		    // find according log if it exists
+		    for (ScratchieAnswerVisitLog userLog : userLogs) {
+			if (userLog.getQbToolQuestion().getUid().equals(item.getUid())
+				&& userLog.getAnswer().equals(optionDto.getAnswer())) {
+			    isScratched = true;
+			    break;
+			}
+		    }
 		}
+		optionDto.setScratched(isScratched);
 	    }
 
-	    boolean isItemUnraveled = this.isItemUnraveled(item, userLogs);
+	    boolean isItemUnraveled = isItemUnraveled(item, userLogs);
 	    item.setUnraveled(isItemUnraveled);
 	}
 
 	return items;
     }
+    
+    private void fillItemWithVsaOptionDtos(ScratchieItem item, Long toolSessionId, Scratchie scratchie,
+	    List<ScratchieAnswerVisitLog> userLogs) {
 
+	//populate Scratchie items with VSA answers, entered by learners in Assessment tool
+	if (item.getQbQuestion().getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS
+		&& scratchie.isAnswersFetchingEnabledAndVsaQuestionsAvailable()) {
+	    ScratchieSession session = scratchieSessionDao.getSessionBySessionId(toolSessionId);
+	    ScratchieUser leader = session.getGroupLeader();
+	    Collection<VsaAnswerDTO> assessmentAnswers = toolService.getVsaAnswersFromAssessment(
+		    scratchie.getActivityUiidProvidingVsaAnswers(), leader.getUserId().intValue(), toolSessionId);
+
+	    Long itemQbQuestionUid = item.getQbQuestion().getUid();
+
+	    //find corresponding QbQuestion
+	    for (VsaAnswerDTO assessmentAnswer : assessmentAnswers) {
+		if (itemQbQuestionUid.equals(assessmentAnswer.getQbQuestionUid())) {
+		    OptionDTO optionDto = new OptionDTO();
+		    optionDto.setAnswer(assessmentAnswer.getAnswer());
+		    optionDto.setCorrect(assessmentAnswer.isCorrect());
+		    optionDto.setUserId(assessmentAnswer.getUserId());
+		    optionDto.setQbQuestionUid(assessmentAnswer.getQbQuestionUid());
+		    if (!scratchie.isConfidenceLevelsEnabled()) {
+			//don't show confidence levels
+			for (ConfidenceLevelDTO confidenceLevel : assessmentAnswer.getConfidenceLevels()) {
+			    confidenceLevel.setLevel(-1);
+			}
+		    }
+		    optionDto.getConfidenceLevelDtos().addAll(assessmentAnswer.getConfidenceLevels());
+
+		    item.getOptionDtos().add(optionDto);
+		}
+	    }
+
+	    //add answers provided by user, which didn't come from Assessment
+	    for (ScratchieAnswerVisitLog userLog : userLogs) {
+		if (itemQbQuestionUid.equals(userLog.getQbToolQuestion().getQbQuestion().getUid())) {
+
+		    //try to find already existing VsaAnswerDTO for the answer
+		    OptionDTO optionDto = null;
+		    boolean skipAddingUserAnswerToConfidenceLevel = false;
+		    for (OptionDTO optionDtoIter : item.getOptionDtos()) {
+			if (itemQbQuestionUid.equals(optionDtoIter.getQbQuestionUid())
+				&& optionDtoIter.getAnswer().equals(userLog.getAnswer())) {
+			    optionDto = optionDtoIter;
+			    skipAddingUserAnswerToConfidenceLevel = optionDtoIter.getUserId()
+				    .equals(leader.getUserId());
+			    break;
+			}
+		    }
+		    if (skipAddingUserAnswerToConfidenceLevel)
+			continue;
+
+		    if (optionDto == null) {
+			optionDto = new OptionDTO();
+			optionDto.setQbQuestionUid(itemQbQuestionUid);
+			String answer = userLog.getAnswer();
+			optionDto.setAnswer(answer);
+			boolean isCorrect = isItemUnraveledByAnswers(item, List.of(answer));
+			optionDto.setCorrect(isCorrect);
+			item.getOptionDtos().add(optionDto);
+		    }
+
+		    ConfidenceLevelDTO confidenceLevelDto = new ConfidenceLevelDTO();
+		    confidenceLevelDto.setUserId(leader.getUserId().intValue());
+		    String userName = StringUtils.isBlank(leader.getFirstName())
+			    && StringUtils.isBlank(leader.getLastName()) ? leader.getLoginName()
+				    : leader.getFirstName() + " " + leader.getLastName();
+		    confidenceLevelDto.setUserName(userName);
+		    confidenceLevelDto.setPortraitUuid(leader.getPortraitId());
+		    //don't show confidence level
+		    confidenceLevelDto.setLevel(-1);
+		    optionDto.getConfidenceLevelDtos().add(confidenceLevelDto);
+		}
+	    }
+	}
+    }
+
     /**
      * Check if the specified item was unraveled by user
      *
@@ -752,24 +877,81 @@
     private boolean isItemUnraveled(ScratchieItem item, List<ScratchieAnswerVisitLog> userLogs) {
 	boolean isItemUnraveled = false;
 
-	for (QbOption option : item.getQbQuestion().getQbOptions()) {
+	if (QbQuestion.TYPE_MULTIPLE_CHOICE == item.getQbQuestion().getType()) {
+	    for (QbOption option : item.getQbQuestion().getQbOptions()) {
 
-	    ScratchieAnswerVisitLog log = null;
+		ScratchieAnswerVisitLog log = null;
+		for (ScratchieAnswerVisitLog userLog : userLogs) {
+		    if (userLog.getQbToolQuestion().getUid().equals(item.getUid())
+			    && userLog.getQbOption().getUid().equals(option.getUid())) {
+			log = userLog;
+			break;
+		    }
+		}
+
+		if (log != null) {
+		    isItemUnraveled |= option.isCorrect();
+		}
+	    }
+	    
+	//VSA question
+	} else {
+	    List<String> userAnswers = new ArrayList<>();
 	    for (ScratchieAnswerVisitLog userLog : userLogs) {
-		if (userLog.getQbOption().getUid().equals(option.getUid())) {
-		    log = userLog;
-		    break;
+		if (userLog.getQbToolQuestion().getUid().equals(item.getUid()) && userLog.getAnswer() != null) {
+		    userAnswers.add(userLog.getAnswer());
 		}
 	    }
 
-	    if (log != null) {
-		isItemUnraveled |= option.isCorrect();
-	    }
+	    isItemUnraveled = isItemUnraveledByAnswers(item, userAnswers);
 	}
 
 	return isItemUnraveled;
     }
+    
+    @Override
+    public boolean isItemUnraveledByAnswers(ScratchieItem item, List<String> userAnswers) {
+	QbQuestion qbQuestion = item.getQbQuestion();
 
+	QbOption correctAnswersGroup = qbQuestion.getQbOptions().get(0).getMaxMark() == 1
+		? qbQuestion.getQbOptions().get(0)
+		: qbQuestion.getQbOptions().get(1);
+	String[] correctAnswers = correctAnswersGroup.getName().split("\\r\\n");
+	for (String correctAnswer : correctAnswers) {
+	    correctAnswer = correctAnswer.strip();
+	    
+	    //prepare regex which takes into account only * special character
+	    String regexWithOnlyAsteriskSymbolActive = "\\Q";
+	    for (int i = 0; i < correctAnswer.length(); i++) {
+		//everything in between \\Q and \\E are taken literally no matter which characters it contains
+		if (correctAnswer.charAt(i) == '*') {
+		    regexWithOnlyAsteriskSymbolActive += "\\E.*\\Q";
+		} else {
+		    regexWithOnlyAsteriskSymbolActive += correctAnswer.charAt(i);
+		}
+	    }
+	    regexWithOnlyAsteriskSymbolActive += "\\E";
+
+	    //check whether answer matches regex
+	    Pattern pattern;
+	    if (qbQuestion.isCaseSensitive()) {
+		pattern = Pattern.compile(regexWithOnlyAsteriskSymbolActive);
+	    } else {
+		pattern = Pattern.compile(regexWithOnlyAsteriskSymbolActive,
+			java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.UNICODE_CASE);
+	    }
+	    
+	    for (String userAnswer : userAnswers) {
+		// check is item unraveled
+		if (pattern.matcher(userAnswer.strip()).matches()) {
+		    return true;
+		}
+	    }
+	}
+
+	return false;
+    }
+
     /**
      *
      * @param scratchie
@@ -786,8 +968,7 @@
 	int mark = 0;
 	// add mark only if an item was unraveled
 	if (isItemUnraveled(item, userLogs)) {
-
-	    int itemAttempts = calculateItemAttempts(userLogs, item);
+	    int itemAttempts = getNumberAttemptsForItem(userLogs, item);
 	    String markStr = (itemAttempts <= presetMarks.length) ? presetMarks[itemAttempts - 1]
 		    : presetMarks[presetMarks.length - 1];
 	    mark = Integer.parseInt(markStr);
@@ -796,7 +977,6 @@
 	    if (scratchie.isExtraPoint() && (itemAttempts == 1)) {
 		mark++;
 	    }
-
 	}
 
 	return mark;
@@ -805,8 +985,7 @@
     /**
      * Returns number of scraches user done for the specified item.
      */
-    private int calculateItemAttempts(List<ScratchieAnswerVisitLog> userLogs, ScratchieItem item) {
-
+    private int getNumberAttemptsForItem(List<ScratchieAnswerVisitLog> userLogs, ScratchieItem item) {
 	int itemAttempts = 0;
 	for (ScratchieAnswerVisitLog userLog : userLogs) {
 	    if (userLog.getQbToolQuestion().getUid().equals(item.getUid())) {
@@ -820,81 +999,93 @@
     @Override
     public List<GroupSummary> getQuestionSummary(Long contentId, Long itemUid) {
 	List<GroupSummary> groupSummaryList = new ArrayList<>();
-
+	Scratchie scratchie = getScratchieByContentId(contentId);
 	ScratchieItem item = scratchieItemDao.getByUid(itemUid);
-	List<QbOption> options = item.getQbQuestion().getQbOptions();
+	boolean isMcqItem = item.getQbQuestion().getType() == QbQuestion.TYPE_MULTIPLE_CHOICE;
+	
 	List<ScratchieSession> sessionList = scratchieSessionDao.getByContentId(contentId);
 	for (ScratchieSession session : sessionList) {
 	    Long sessionId = session.getSessionId();
-
 	    // one new summary for one session.
 	    GroupSummary groupSummary = new GroupSummary(session);
-
-	    Map<Long, QbOptionDTO> optionMap = new HashMap<>();
-	    for (QbOption dbOption : options) {
-
-		// clone it so it doesn't interfere with values from other sessions
-		QbOptionDTO optionDto = new QbOptionDTO();
-		optionDto.setQbOption(dbOption);
-		int[] attempts = new int[options.size()];
-		optionDto.setAttempts(attempts);
-		optionMap.put(dbOption.getUid(), optionDto);
-	    }
 	    List<ScratchieAnswerVisitLog> sessionAttempts = scratchieAnswerVisitDao.getLogsBySessionAndItem(sessionId,
 		    itemUid);
 
-	    List<ScratchieUser> users = scratchieUserDao.getBySessionID(sessionId);
+	    Map<Long, OptionDTO> optionMap = new HashMap<>();
+	    if (isMcqItem) {
+		List<QbOption> options = item.getQbQuestion().getQbOptions();
+		for (QbOption dbOption : options) {
+		    // clone it so it doesn't interfere with values from other sessions
+		    OptionDTO optionDto = new OptionDTO();
+		    optionDto.setQbOption(dbOption);
+		    int[] attempts = new int[options.size()];
+		    optionDto.setAttempts(attempts);
+		    optionMap.put(dbOption.getUid(), optionDto);
+		}
 
+	    } else {
+		fillItemWithVsaOptionDtos(item, sessionId, scratchie, sessionAttempts);
+		List<OptionDTO> optionDtos = item.getOptionDtos();
+		for (OptionDTO optionDto : optionDtos) {
+		    int[] attempts = new int[optionDtos.size()];
+		    optionDto.setAttempts(attempts);
+		    optionMap.put(Long.valueOf(optionDto.getAnswerHash()), optionDto);
+		}
+	    }
+
 	    // calculate attempts table
+	    List<ScratchieUser> users = scratchieUserDao.getBySessionID(sessionId);
 	    for (ScratchieUser user : users) {
 		int attemptNumber = 0;
 
 		for (ScratchieAnswerVisitLog attempt : sessionAttempts) {
-		    QbOptionDTO optionDto = optionMap.get(attempt.getQbOption().getUid());
-		    int[] attempts = optionDto == null ? new int[options.size()] : optionDto.getAttempts();
+		    Long optionUidOrAnswer = isMcqItem ? attempt.getQbOption().getUid() : attempt.getAnswer().hashCode();
+		    OptionDTO optionDto = optionMap.get(optionUidOrAnswer);
+		    int[] attempts = optionDto == null ? new int[optionMap.size()] : optionDto.getAttempts();
 		    // +1 for corresponding choice
 		    attempts[attemptNumber++]++;
 		}
 	    }
 
-	    Collection<QbOptionDTO> sortedOptions = new LinkedList<>();
+	    Collection<OptionDTO> sortedOptions = new LinkedList<>();
 	    sortedOptions.addAll(optionMap.values());
 	    groupSummary.setOptionDtos(sortedOptions);
 	    groupSummaryList.add(groupSummary);
 	}
 
 	// show total groupSummary if there is more than 1 group available
-	if (sessionList.size() > 1) {
+	if (sessionList.size() > 1 && isMcqItem) {
 	    GroupSummary groupSummaryTotal = new GroupSummary();
-	    groupSummaryTotal.setSessionId(new Long(0));
+	    groupSummaryTotal.setSessionId(0L);
 	    groupSummaryTotal.setSessionName("Summary");
 	    groupSummaryTotal.setMark(0);
 
-	    Map<Long, QbOptionDTO> optionMapTotal = new HashMap<>();
+	    Map<Long, OptionDTO> optionMapTotal = new HashMap<>();
+	    List<QbOption> options = item.getQbQuestion().getQbOptions();
 	    for (QbOption dbOption : options) {
 
 		// clone it so it doesn't interfere with values from other sessions
-		QbOptionDTO optionDto = new QbOptionDTO();
+		OptionDTO optionDto = new OptionDTO();
 		optionDto.setQbOption(dbOption);
 		int[] attempts = new int[options.size()];
 		optionDto.setAttempts(attempts);
 		optionMapTotal.put(dbOption.getUid(), optionDto);
 	    }
 
 	    for (GroupSummary groupSummary : groupSummaryList) {
-		Collection<QbOptionDTO> sortedOptionDtos = groupSummary.getOptionDtos();
-		for (QbOptionDTO sortedOptionDto : sortedOptionDtos) {
-		    int[] attempts = sortedOptionDto.getAttempts();
+		Collection<OptionDTO> optionDtos = groupSummary.getOptionDtos();
+		for (OptionDTO optionDto : optionDtos) {
+		    int[] attempts = optionDto.getAttempts();
 
-		    QbOptionDTO optionTotal = optionMapTotal.get(sortedOptionDto.getQbOption().getUid());
+		    OptionDTO optionTotal = optionMapTotal.get(optionDto.getQbOption().getUid());
 		    int[] attemptsTotal = optionTotal.getAttempts();
 		    for (int i = 0; i < attempts.length; i++) {
 			attemptsTotal[i] += attempts[i];
 		    }
 		}
 	    }
 
-	    Collection<QbOptionDTO> sortedOptions = new TreeSet<>();
+	    Collection<OptionDTO> sortedOptions = new TreeSet<>();
 	    sortedOptions.addAll(optionMapTotal.values());
 	    groupSummaryTotal.setOptionDtos(sortedOptions);
 	    groupSummaryList.add(0, groupSummaryTotal);
@@ -1147,8 +1338,8 @@
 	    // find out the correct answer's sequential letter - A,B,C...
 	    String correctOptionLetter = "";
 	    int optionCount = 1;
-	    for (QbOptionDTO optionDto : item.getOptionDtos()) {
-		if (optionDto.getQbOption().isCorrect()) {
+	    for (OptionDTO optionDto : item.getOptionDtos()) {
+		if (optionDto.getQbOption() != null && optionDto.getQbOption().isCorrect() || optionDto.isCorrect()) {
 		    correctOptionLetter = String.valueOf((char) ((optionCount + 'A') - 1));
 		    break;
 		}
@@ -1330,6 +1521,7 @@
 
 	for (ScratchieItem item : items) {
 	    List<GroupSummary> itemSummary = getQuestionSummary(contentId, item.getUid());
+	    boolean isMcqItem = item.getQbQuestion().getType() == QbQuestion.TYPE_MULTIPLE_CHOICE;
 
 	    row = new ExcelCell[1];
 	    row[0] = new ExcelCell(
@@ -1343,28 +1535,30 @@
 	    rowList.add(ScratchieServiceImpl.EMPTY_ROW);
 
 	    // show all team summary in case there is more than 1 group
-	    if (summaryList.size() > 1) {
+	    if (summaryList.size() > 1 && isMcqItem) {
 		row = new ExcelCell[1];
 		row[0] = new ExcelCell(getMessage("label.all.teams.summary"), true);
 		rowList.add(row);
 
 		GroupSummary allTeamSummary = itemSummary.get(0);
-		Collection<QbOptionDTO> optionDtos = allTeamSummary.getOptionDtos();
+		Collection<OptionDTO> optionDtos = allTeamSummary.getOptionDtos();
 
 		row = new ExcelCell[1 + optionDtos.size()];
 		for (int i = 0; i < optionDtos.size(); i++) {
 		    row[i + 1] = new ExcelCell((long) i + 1, IndexedColors.YELLOW);
 		}
 		rowList.add(row);
 
-		for (QbOptionDTO optionDto : optionDtos) {
+		for (OptionDTO optionDto : optionDtos) {
 		    row = new ExcelCell[1 + optionDtos.size()];
-		    String optionTitle = removeHtmlMarkup(optionDto.getQbOption().getName());
+		    String optionTitle;
 		    IndexedColors color = null;
+		    optionTitle = removeHtmlMarkup(optionDto.getQbOption().getName());
 		    if (optionDto.getQbOption().isCorrect()) {
 			optionTitle += "(" + getMessage("label.monitoring.item.summary.correct") + ")";
 			color = IndexedColors.GREEN;
 		    }
+		    
 		    columnCount = 0;
 		    row[columnCount++] = new ExcelCell(optionTitle, color);
 
@@ -1385,7 +1579,7 @@
 		    continue;
 		}
 
-		Collection<QbOptionDTO> optionDtos = groupSummary.getOptionDtos();
+		Collection<OptionDTO> optionDtos = groupSummary.getOptionDtos();
 
 		row = new ExcelCell[1];
 		row[0] = new ExcelCell(groupSummary.getSessionName(), true);
@@ -1397,12 +1591,21 @@
 		}
 		rowList.add(row);
 
-		for (QbOptionDTO optionDto : optionDtos) {
+		for (OptionDTO optionDto : optionDtos) {
 		    row = new ExcelCell[1 + optionDtos.size()];
-		    String optionTitle = removeHtmlMarkup(optionDto.getQbOption().getName());
-		    if (optionDto.getQbOption().isCorrect()) {
-			optionTitle += "(" + getMessage("label.monitoring.item.summary.correct") + ")";
+		    String optionTitle;
+		    if (isMcqItem) {
+			optionTitle = removeHtmlMarkup(optionDto.getQbOption().getName());
+			if (optionDto.getQbOption().isCorrect()) {
+			    optionTitle += "(" + getMessage("label.monitoring.item.summary.correct") + ")";
+			}
+		    } else {
+			optionTitle = optionDto.getAnswer();
+			if (optionDto.isCorrect()) {
+			    optionTitle += "(" + getMessage("label.monitoring.item.summary.correct") + ")";
+			}
 		    }
+
 		    columnCount = 0;
 		    row[columnCount++] = new ExcelCell(optionTitle, false);
 
@@ -1446,6 +1649,7 @@
 		rowList.add(row);
 
 		for (ScratchieItem item : items) {
+		    boolean isMcqItem = item.getQbQuestion().getType() == QbQuestion.TYPE_MULTIPLE_CHOICE;
 		    row = new ExcelCell[1];
 		    row[0] = new ExcelCell(
 			    getMessage("label.question.semicolon", new Object[] { item.getQbQuestion().getName() }),
@@ -1459,7 +1663,7 @@
 		    for (ScratchieAnswerVisitLog log : logs) {
 			row = new ExcelCell[4];
 			row[0] = new ExcelCell(new Long(i++), false);
-			String optionDescr = removeHtmlMarkup(log.getQbOption().getName());
+			String optionDescr = isMcqItem ? removeHtmlMarkup(log.getQbOption().getName()) : log.getAnswer();
 			row[1] = new ExcelCell(optionDescr, false);
 			row[3] = new ExcelCell(fullDateFormat.format(log.getAccessDate()), false);
 			rowList.add(row);
@@ -1533,10 +1737,11 @@
 
 		    // correct option
 		    String correctOption = "";
-		    List<QbOptionDTO> options = itemDto.getOptionDtos();
-		    for (QbOptionDTO option : options) {
-			if (option.getQbOption().isCorrect()) {
-			    correctOption = removeHtmlMarkup(option.getQbOption().getName());
+		    List<OptionDTO> options = itemDto.getOptionDtos();
+		    for (OptionDTO option : options) {
+			if (option.getQbOption() != null && option.getQbOption().isCorrect() || option.isCorrect()) {
+			    correctOption = option.getQbOption() == null ? option.getAnswer() : option.getQbOption().getName();
+			    correctOption = removeHtmlMarkup(correctOption);
 			}
 		    }
 		    row[columnCount++] = new ExcelCell(correctOption, false);
@@ -1566,7 +1771,8 @@
 		    }
 
 		    for (ScratchieAnswerVisitLog log : logs) {
-			String optionText = removeHtmlMarkup(log.getQbOption().getName());
+			String optionText = removeHtmlMarkup(
+				log.getQbOption() == null ? log.getAnswer() : log.getQbOption().getName());
 			row[columnCount++] = new ExcelCell(optionText, false);
 		    }
 		    for (int i = logs.size(); i < itemDto.getOptionDtos().size(); i++) {
@@ -1761,7 +1967,7 @@
 	String sequencialLetter = "";
 
 	int optionCount = 1;
-	for (QbOptionDTO option : item.getOptionDtos()) {
+	for (OptionDTO option : item.getOptionDtos()) {
 	    if (option.getQbOption().getUid().equals(asnwer.getUid())) {
 		sequencialLetter = String.valueOf((char) ((optionCount + 'A') - 1));
 		break;
@@ -2270,6 +2476,7 @@
 	scratchie.setShowScrachiesInResults(JsonUtil.optBoolean(toolContentJSON, "showScrachiesInResults", true));
 	scratchie.setConfidenceLevelsActivityUiid(
 		JsonUtil.optInt(toolContentJSON, RestTags.CONFIDENCE_LEVELS_ACTIVITY_UIID));
+	scratchie.setActivityUiidProvidingVsaAnswers(JsonUtil.optInt(toolContentJSON, "activityUiidProvidingVsaAnswers"));
 
 	// Scratchie Items
 	Set<ScratchieItem> newItems = new LinkedHashSet<>();
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 06d090eefddaafa108bcd8614d47d3d92f946210)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -47,6 +47,7 @@
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.qb.QbConstants;
 import org.lamsfoundation.lams.qb.QbUtils;
 import org.lamsfoundation.lams.qb.form.QbQuestionForm;
 import org.lamsfoundation.lams.qb.model.QbOption;
@@ -64,6 +65,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.CommonConstants;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -181,8 +183,13 @@
 
 	//display confidence providing activities
 	Set<ToolActivity> confidenceLevelsActivities = scratchieService
-		.getPrecedingConfidenceLevelsActivities(contentId);
-	sessionMap.put(ScratchieConstants.ATTR_CONFIDENCE_LEVELS_ACTIVITIES, confidenceLevelsActivities);
+		.getActivitiesProvidingConfidenceLevels(contentId);
+	sessionMap.put(ScratchieConstants.ATTR_ACTIVITIES_PROVIDING_CONFIDENCE_LEVELS, confidenceLevelsActivities);
+
+	//display activities providing VSA answers
+	Set<ToolActivity> activitiesProvidingVsaAnswers = scratchieService.getActivitiesProvidingVsaAnswers(contentId);
+	sessionMap.put(ScratchieConstants.ATTR_ACTIVITIES_PROVIDING_VSA_ANSWERS, activitiesProvidingVsaAnswers);
+
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 	sessionMap.put(ScratchieConstants.ATTR_RESOURCE_FORM, authoringForm);
 	return "pages/authoring/start";
@@ -250,7 +257,7 @@
 	}
 
 	// ************************* Handle scratchie items *******************
-	Set<ScratchieItem> items = new LinkedHashSet<>();
+	Set<ScratchieItem> items = new TreeSet<>();
 	SortedSet<ScratchieItem> newItems = getItemList(sessionMap);
 	Iterator<ScratchieItem> iter = newItems.iterator();
 	while (iter.hasNext()) {
@@ -293,25 +300,31 @@
      * Ajax call, will add one more input line for new resource item instruction.
      */
     @RequestMapping("/addItem")
-    private String addItem(@ModelAttribute("scratchieItemForm") QbQuestionForm form,
-	    HttpServletRequest request) {
+    private String addItem(@ModelAttribute("scratchieItemForm") QbQuestionForm form, HttpServletRequest request,
+	    @RequestParam Integer questionType) {
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
-	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	form.setSessionMapID(sessionMap.getSessionID());
-	form.setContentFolderID(contentFolderID);
 
 	List<QbOption> optionList = new ArrayList<>();
-	for (int i = 0; i < ScratchieConstants.INITIAL_OPTIONS_NUMBER; i++) {
+	int initialOptionsNumber = questionType == QbQuestion.TYPE_MULTIPLE_CHOICE
+		? ScratchieConstants.INITIAL_MCQ_OPTIONS_NUMBER
+		: 2;
+	for (int i = 0; i < initialOptionsNumber; i++) {
 	    QbOption option = new QbOption();
 	    option.setDisplayOrder(i + 1);
 	    optionList.add(option);
 	}
-	request.setAttribute(ScratchieConstants.ATTR_OPTION_LIST, optionList);
-	
+	request.setAttribute(QbConstants.ATTR_OPTION_LIST, optionList);
+
 	QbUtils.fillFormWithUserCollections(qbService, form, null);
 
+	// generate a new contentFolderID for new question
+	String contentFolderID = FileUtil.generateUniqueContentFolderID();
+	form.setContentFolderID(contentFolderID);
 	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
-	return "pages/authoring/parts/additem";
+
+	return questionType == QbQuestion.TYPE_MULTIPLE_CHOICE ? "pages/authoring/parts/addMcq"
+		: "pages/authoring/parts/addVsa";
     }
 
     /**
@@ -322,7 +335,6 @@
 	    HttpServletRequest request) {
 	// get back sessionMAP
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
-	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
 	int itemIdx = WebUtil.readIntParam(request, ScratchieConstants.PARAM_ITEM_INDEX);
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
@@ -335,16 +347,25 @@
 	if (itemIdx >= 0) {
 	    form.setItemIndex(String.valueOf(itemIdx));
 	}
+	form.setQuestionType(qbQuestion.getType());
+	boolean isMcqQuestionType = qbQuestion.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE;
+	if (!isMcqQuestionType) {
+	    form.setFeedback(qbQuestion.getFeedback());
+	    form.setAnswerRequired(qbQuestion.isAnswerRequired());
+	    form.setCaseSensitive(qbQuestion.isCaseSensitive());
+	    form.setAutocompleteEnabled(qbQuestion.isAutocompleteEnabled());
+	}
 
 	List<QbOption> optionList = qbQuestion.getQbOptions();
-	request.setAttribute(ScratchieConstants.ATTR_OPTION_LIST, optionList);
+	request.setAttribute(QbConstants.ATTR_OPTION_LIST, optionList);
 
-	form.setContentFolderID(contentFolderID);
 	form.setSessionMapID(sessionMap.getSessionID());
 	QbUtils.fillFormWithUserCollections(qbService, form, qbQuestion.getUid());
 	
-	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
-	return "pages/authoring/parts/additem";
+	form.setContentFolderID(qbQuestion.getContentFolderId());
+	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, qbQuestion.getContentFolderId());
+	return isMcqQuestionType ? "pages/authoring/parts/addMcq"
+		: "pages/authoring/parts/addVsa";
     }
     
     /**
@@ -396,7 +417,9 @@
 	final boolean isAddingQuestion = itemIdx == -1;
 	if (isAddingQuestion) { // add
 	    qbQuestion = new QbQuestion();
-	    qbQuestion.setType(QbQuestion.TYPE_MULTIPLE_CHOICE);
+	    qbQuestion.setType(form.getQuestionType());
+	    qbQuestion.setMaxMark(1);
+	    qbQuestion.setPenaltyFactor(0);
 	    
 	    item = new ScratchieItem();
 	    int maxSeq = 1;
@@ -420,11 +443,21 @@
 	// without eviction changes would be saved immediately into DB
 	scratchieService.releaseFromCache(oldQbQuestion);
 
-	qbQuestion.setName(form.getTitle());
-	qbQuestion.setDescription(form.getDescription());
+	qbQuestion.setName(form.getTitle().strip());
+	qbQuestion.setDescription(form.getDescription().strip());
+	qbQuestion.setContentFolderId(form.getContentFolderID());
+	
+	boolean isMcqQuestionType = qbQuestion.getType() == QbQuestion.TYPE_MULTIPLE_CHOICE;
+	//handle VSA question type
+	if (!isMcqQuestionType) {
+	    qbQuestion.setFeedback(form.getFeedback());
+	    qbQuestion.setAnswerRequired(form.isAnswerRequired());
+	    qbQuestion.setCaseSensitive(form.isCaseSensitive());
+	    qbQuestion.setAutocompleteEnabled(form.isAutocompleteEnabled());
+	}
 
 	// set options
-	Set<QbOption> optionList = getOptionsFromRequest(request, true);
+	Set<QbOption> optionList = getOptionsFromRequest(request, isMcqQuestionType, true);
 	List<QbOption> options = new ArrayList<>(optionList);
 	qbQuestion.setQbOptions(options);
 
@@ -576,7 +609,7 @@
     @RequestMapping("/addAnswer")
     private String addAnswer(HttpServletRequest request) {
 
-	SortedSet<QbOption> optionList = getOptionsFromRequest(request, false);
+	SortedSet<QbOption> optionList = getOptionsFromRequest(request, true, false);
 
 	QbOption option = new QbOption();
 	int maxSeq = 1;
@@ -587,7 +620,7 @@
 	option.setDisplayOrder(maxSeq);
 	optionList.add(option);
 
-	request.setAttribute(ScratchieConstants.ATTR_OPTION_LIST, optionList);
+	request.setAttribute(QbConstants.ATTR_OPTION_LIST, optionList);
 	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID,
 		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
 	return "pages/authoring/parts/optionlist";
@@ -605,7 +638,7 @@
     @RequestMapping("/removeAnswer")
     private String removeAnswer(HttpServletRequest request) {
 
-	SortedSet<QbOption> optionList = getOptionsFromRequest(request, false);
+	SortedSet<QbOption> optionList = getOptionsFromRequest(request, true, false);
 
 	int optionIndex = NumberUtils.toInt(request.getParameter(ScratchieConstants.PARAM_OPTION_INDEX), -1);
 	if (optionIndex != -1) {
@@ -615,7 +648,7 @@
 	    optionList.addAll(rList);
 	}
 
-	request.setAttribute(ScratchieConstants.ATTR_OPTION_LIST, optionList);
+	request.setAttribute(QbConstants.ATTR_OPTION_LIST, optionList);
 	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID,
 		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
 	return "pages/authoring/parts/optionlist";
@@ -650,7 +683,7 @@
     }
 
     private String switchOption(HttpServletRequest request, boolean up) {
-	SortedSet<QbOption> optionList = getOptionsFromRequest(request, false);
+	SortedSet<QbOption> optionList = getOptionsFromRequest(request, true, false);
 
 	int optionIndex = NumberUtils.toInt(request.getParameter(ScratchieConstants.PARAM_OPTION_INDEX), -1);
 	if (optionIndex != -1) {
@@ -674,7 +707,7 @@
 	    optionList.addAll(rList);
 	}
 
-	request.setAttribute(ScratchieConstants.ATTR_OPTION_LIST, optionList);
+	request.setAttribute(QbConstants.ATTR_OPTION_LIST, optionList);
 	return "pages/authoring/parts/optionlist";
     }
 
@@ -750,22 +783,22 @@
      *            whether the blank options will be preserved or not
      *
      */
-    private TreeSet<QbOption> getOptionsFromRequest(HttpServletRequest request, boolean isForSaving) {
-	Map<String, String> paramMap = splitRequestParameter(request, ScratchieConstants.ATTR_OPTION_LIST);
-	Integer correctOptionIndex = (paramMap.get(ScratchieConstants.ATTR_OPTION_CORRECT) == null) ? null
-		: NumberUtils.toInt(paramMap.get(ScratchieConstants.ATTR_OPTION_CORRECT));
+    private TreeSet<QbOption> getOptionsFromRequest(HttpServletRequest request, boolean isMcqQuestion, boolean isForSaving) {
+	Map<String, String> paramMap = splitRequestParameter(request, QbConstants.ATTR_OPTION_LIST);
+	Integer correctOptionIndex = (paramMap.get(QbConstants.ATTR_OPTION_CORRECT) == null) ? null
+		: NumberUtils.toInt(paramMap.get(QbConstants.ATTR_OPTION_CORRECT));
 
-	int count = NumberUtils.toInt(paramMap.get(ScratchieConstants.ATTR_OPTION_COUNT));
+	int count = NumberUtils.toInt(paramMap.get(QbConstants.ATTR_OPTION_COUNT));
 	TreeSet<QbOption> optionList = new TreeSet<>();
 	for (int i = 0; i < count; i++) {
 
-	    String optionDescription = paramMap.get(ScratchieConstants.ATTR_OPTION_DESCRIPTION_PREFIX + i);
-	    if ((optionDescription == null) && isForSaving) {
+	    String optionName = paramMap.get(QbConstants.ATTR_OPTION_NAME_PREFIX + i);
+	    if ((optionName == null) && isForSaving && isMcqQuestion) {
 		continue;
 	    }
 
 	    QbOption option = null;
-	    String uidStr = paramMap.get(ScratchieConstants.ATTR_OPTION_UID_PREFIX + i);
+	    String uidStr = paramMap.get(QbConstants.ATTR_OPTION_UID_PREFIX + i);
 	    if (uidStr != null) {
 		Long uid = NumberUtils.toLong(uidStr);
 		option = scratchieService.getQbOptionByUid(uid);
@@ -774,13 +807,22 @@
 		option = new QbOption();
 	    }
 
-	    String orderIdStr = paramMap.get(ScratchieConstants.ATTR_OPTION_ORDER_ID_PREFIX + i);
-	    Integer orderId = NumberUtils.toInt(orderIdStr);
-	    option.setDisplayOrder(orderId);
-	    option.setName(optionDescription);
-	    if ((correctOptionIndex != null) && correctOptionIndex.equals(orderId)) {
+	    Integer displayOrder = NumberUtils.toInt(paramMap.get(QbConstants.ATTR_OPTION_DISPLAY_ORDER_PREFIX + i));
+	    option.setDisplayOrder(displayOrder);
+	    option.setName(optionName);
+	    if ((correctOptionIndex != null) && correctOptionIndex.equals(displayOrder) && isMcqQuestion) {
 		option.setCorrect(true);
 	    }
+	    
+	    //handle VSA question type
+	    if (!isMcqQuestion) {
+		float maxMark = i == 0 ? 1 : 0;
+		option.setMaxMark(maxMark);
+
+		String feedback = paramMap.get(QbConstants.ATTR_OPTION_FEEDBACK_PREFIX + i);
+		option.setFeedback(feedback);
+	    }
+	    
 	    optionList.add(option);
 
 	}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -46,7 +46,9 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.qb.QbConstants;
 import org.lamsfoundation.lams.qb.model.QbOption;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
@@ -71,8 +73,10 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -300,17 +304,17 @@
 	    items = shuffledItems;
 	}
 
-	// for teacher in monitoring display the number of attempt.
-	if (showOrder) {
-	    scratchieService.getScratchesOrder(items, toolSessionId);
-	}
-
 	//display confidence levels
 	if (scratchie.isConfidenceLevelsEnabled()) {
 	    scratchieService.populateItemsWithConfidenceLevels((Long) sessionMap.get(ScratchieConstants.ATTR_USER_ID),
 		    toolSessionId, scratchie.getConfidenceLevelsActivityUiid(), items);
 	}
 
+	// for teacher in monitoring display the number of attempt.
+	if (showOrder) {
+	    scratchieService.getScratchesOrder(items, toolSessionId);
+	}
+
 	// populate items with the existing burning questions for displaying purposes
 	List<ScratchieBurningQuestion> burningQuestions = null;
 	if (scratchie.isBurningQuestionsEnabled()) {
@@ -350,9 +354,7 @@
     @RequestMapping("/recordItemScratched")
     private String recordItemScratched(HttpServletRequest request, HttpServletResponse response)
 	    throws IOException, ScratchieApplicationException {
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	final Long optionUid = NumberUtils.createLong(request.getParameter(ScratchieConstants.PARAM_OPTION_UID));
 	final Long itemUid = NumberUtils.createLong(request.getParameter(ScratchieConstants.PARAM_ITEM_UID));
@@ -378,7 +380,7 @@
 	}
 
 	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
-	ObjectNode.put(ScratchieConstants.ATTR_OPTION_CORRECT, option.isCorrect());
+	ObjectNode.put(QbConstants.ATTR_OPTION_CORRECT, option.isCorrect());
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().print(ObjectNode);
 
@@ -394,16 +396,88 @@
 
 	return null;
     }
+    
+    /**
+     * Record in DB that leader has provided this answer. And return whether it's correct or not.
+     */
+    @RequestMapping("/recordVsaAnswer")
+    private String recordVsaAnswer(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ScratchieApplicationException {
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	final Long itemUid = NumberUtils.createLong(request.getParameter(ScratchieConstants.PARAM_ITEM_UID));
+	final String answer = request.getParameter("answer");
 
+	ScratchieSession toolSession = scratchieService.getScratchieSessionBySessionId(toolSessionId);
+
+	ScratchieUser leader = getCurrentUser(toolSessionId);
+	// only leader is allowed to answer
+	if (!toolSession.isUserGroupLeader(leader.getUid())) {
+	    return null;
+	}
+
+	// Return whether option is correct or not
+	ScratchieItem item = scratchieService.getScratchieItemByUid(itemUid);
+	boolean isAnswerCorrect = scratchieService.isItemUnraveledByAnswers(item, List.of(answer));
+	
+	ObjectNode objectNode = JsonNodeFactory.instance.objectNode();
+	objectNode.put("isAnswerCorrect", isAnswerCorrect);
+	response.setContentType("application/json;charset=utf-8");
+	response.getWriter().print(objectNode);
+
+	// create a new thread to record item scratched (in order to do this task in parallel not to slow down sending
+	// response back)
+	Thread recordVsaAnswerThread = new Thread(new Runnable() {
+	    @Override
+	    public void run() {
+		scratchieService.recordVsaAnswer(toolSessionId, itemUid, answer);
+	    }
+	}, "LAMS_recordVsaAnswer_thread");
+	recordVsaAnswerThread.start();
+
+	return null;
+    }
+
+    @RequestMapping("/vsaAutocomplete")
+    @ResponseBody
+    public String vsaAutocomplete(HttpServletRequest request, HttpServletResponse response,
+	    @RequestParam Long itemUid) {
+	String userAnswer = WebUtil.readStrParam(request, "term", true);
+	ScratchieItem item = scratchieService.getScratchieItemByUid(itemUid);
+	QbQuestion qbQuestion = item.getQbQuestion();
+	
+	ArrayNode responseJSON = JsonNodeFactory.instance.arrayNode();
+	if (StringUtils.isNotBlank(userAnswer)) {
+	    userAnswer = userAnswer.trim();
+	    userAnswer = qbQuestion.isCaseSensitive() ? userAnswer : userAnswer.toLowerCase();
+	    
+	    for (QbOption option : qbQuestion.getQbOptions()) {
+
+		//filter out options not starting with 'term' and containing '*'		
+		String optionTitle = qbQuestion.isCaseSensitive() ? option.getName() : option.getName().toLowerCase();
+		int i = 0;
+		for (String optionAnswer : optionTitle.split("\\r\\n")) {
+		    if (optionAnswer.startsWith(userAnswer) && !optionAnswer.contains("*")) {
+			ObjectNode optionJSON = JsonNodeFactory.instance.objectNode();
+			String originalOptionAnswer = option.getName().split("\\r\\n")[i];
+			optionJSON.put("label", originalOptionAnswer);
+			responseJSON.add(optionJSON);
+		    }
+		    i++;
+		}
+	    }
+	}
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
     /**
      * Stores date when user has started activity with time limit.
      */
     @RequestMapping("/launchTimeLimit")
     private String launchTimeLimit(HttpServletRequest request)
 	    throws ScratchieApplicationException, SchedulerException {
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	ScratchieSession toolSession = scratchieService.getScratchieSessionBySessionId(toolSessionId);
 
@@ -423,11 +497,7 @@
      */
     @RequestMapping("/showResults")
     private String showResults(HttpServletRequest request) throws ScratchieApplicationException, IOException {
-	// get back SessionMap
-	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
-	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	boolean isReflectOnActivity = (Boolean) sessionMap.get(ScratchieConstants.ATTR_REFLECTION_ON);
 	boolean isBurningQuestionsEnabled = (Boolean) sessionMap
 		.get(ScratchieConstants.ATTR_IS_BURNING_QUESTIONS_ENABLED);
@@ -514,10 +584,7 @@
     @RequestMapping("/like")
     private String like(HttpServletRequest request, HttpServletResponse response)
 	    throws IOException, ServletException, ScratchieApplicationException {
-
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	ScratchieSession toolSession = scratchieService.getScratchieSessionBySessionId(sessionId);
 
@@ -541,10 +608,7 @@
     @RequestMapping("/removeLike")
     private String removeLike(HttpServletRequest request, HttpServletResponse response)
 	    throws IOException, ServletException, ScratchieApplicationException {
-
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	ScratchieSession toolSession = scratchieService.getScratchieSessionBySessionId(sessionId);
 
@@ -570,10 +634,7 @@
      */
     @RequestMapping("/finish")
     private String finish(HttpServletRequest request) {
-	// get back SessionMap
-	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	HttpSession ss = SessionManager.getSession();
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -597,9 +658,7 @@
     @RequestMapping("/autosaveBurningQuestions")
     @ResponseBody
     private void autosaveBurningQuestions(HttpServletRequest request) throws ScratchieApplicationException {
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	// only leader is allowed to submit burning questions
@@ -616,10 +675,7 @@
      */
 
     private void saveBurningQuestions(HttpServletRequest request) {
-
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	Collection<ScratchieItem> items = (Collection<ScratchieItem>) sessionMap.get(ScratchieConstants.ATTR_ITEM_LIST);
 
@@ -652,10 +708,8 @@
     @RequestMapping("/newReflection")
     private String newReflection(@ModelAttribute("reflectionForm") ReflectionForm reflectionForm,
 	    HttpServletRequest request) throws ScratchieApplicationException, IOException {
-
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	Long userUid = (Long) sessionMap.get(ScratchieConstants.ATTR_USER_UID);
 
@@ -699,9 +753,7 @@
 	final Integer userId = reflectionForm.getUserID();
 	final String entryText = reflectionForm.getEntryText();
 
-	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	final Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	// check for existing notebook entry
@@ -755,4 +807,11 @@
 	}
 	return scratchieUser;
     }
+    
+    @SuppressWarnings("unchecked")
+    private SessionMap<String, Object> getSessionMap(HttpServletRequest request) {
+	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
+	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
+    }
 }
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -20,8 +20,9 @@
 import javax.websocket.server.ServerEndpoint;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
-import org.lamsfoundation.lams.tool.scratchie.dto.QbOptionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.OptionDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
 import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
@@ -148,14 +149,14 @@
 
 	    Collection<ScratchieItem> items = LearningWebsocketServer.getScratchieService()
 		    .getItemsWithIndicatedScratches(toolSessionId);
-	    Map<Long, Map<Long, Boolean>> sessionCache = LearningWebsocketServer.cache.get(toolSessionId);
+	    Map<Long, Map<String, Boolean>> sessionCache = LearningWebsocketServer.cache.get(toolSessionId);
 	    for (ScratchieItem item : items) {
 		Long itemUid = item.getUid();
 		// do not init variables below until it's really needed
-		Map<Long, Boolean> itemCache = null;
+		Map<String, Boolean> itemCache = null;
 		ObjectNode itemJSON = null;
-		for (QbOptionDTO answer : item.getOptionDtos()) {
-		    if (answer.isScratched()) {
+		for (OptionDTO optionDto : item.getOptionDtos()) {
+		    if (optionDto.isScratched()) {
 			// answer is scratched, check if it is present in cache
 			if (itemCache == null) {
 			    itemCache = sessionCache.get(itemUid);
@@ -165,17 +166,25 @@
 			    }
 			}
 
-			Long optionUid = answer.getQbOption().getUid();
-			Boolean answerStoredIsCorrect = answer.getQbOption().isCorrect();
-			Boolean answerCache = itemCache.get(optionUid);
+			String optionUidOrAnswer;
+			Boolean isCorrectStoredAnswer;
+			if (QbQuestion.TYPE_MULTIPLE_CHOICE == item.getQbQuestion().getType()) {
+			    optionUidOrAnswer = optionDto.getQbOption().getUid().toString();
+			    isCorrectStoredAnswer = optionDto.getQbOption().isCorrect();
+			} else {
+			    optionUidOrAnswer = optionDto.getAnswer();
+			    isCorrectStoredAnswer = optionDto.isCorrect();
+			}
+
+			Boolean answerCache = itemCache.get(optionUidOrAnswer);
 			// check if the correct answer is stored in cache
-			if ((answerCache == null) || !answerCache.equals(answerStoredIsCorrect)) {
+			if ((answerCache == null) || !answerCache.equals(isCorrectStoredAnswer)) {
 			    // send only updates, nothing Learners are already aware of
-			    itemCache.put(optionUid, answerStoredIsCorrect);
+			    itemCache.put(optionUidOrAnswer, isCorrectStoredAnswer);
 			    if (itemJSON == null) {
 				itemJSON = JsonNodeFactory.instance.objectNode();
 			    }
-			    itemJSON.put(optionUid.toString(), answerStoredIsCorrect);
+			    itemJSON.put(optionUidOrAnswer.toString(), isCorrectStoredAnswer);
 			}
 		    }
 		}
@@ -203,7 +212,7 @@
 
     private static final SendWorker sendWorker = new SendWorker();
     // maps toolSessionId -> itemUid -> optionUid -> isCorrect
-    private static final Map<Long, Map<Long, Map<Long, Boolean>>> cache = new ConcurrentHashMap<>();
+    private static final Map<Long, Map<Long, Map<String, Boolean>>> cache = new ConcurrentHashMap<>();
     private static final Map<Long, Set<Session>> websockets = new ConcurrentHashMap<>();
 
     static {
@@ -223,7 +232,7 @@
 	    sessionWebsockets = ConcurrentHashMap.newKeySet();
 	    LearningWebsocketServer.websockets.put(toolSessionId, sessionWebsockets);
 
-	    Map<Long, Map<Long, Boolean>> sessionCache = new TreeMap<>();
+	    Map<Long, Map<String, Boolean>> sessionCache = new TreeMap<>();
 	    LearningWebsocketServer.cache.put(toolSessionId, sessionCache);
 	}
 	sessionWebsockets.add(websocket);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
===================================================================
diff -u -r4dfbbc90e3d414eaf3f4282a3a38b4ec741384d7 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 4dfbbc90e3d414eaf3f4282a3a38b4ec741384d7)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -48,7 +48,7 @@
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.scratchie.dto.LeaderResultsDTO;
-import org.lamsfoundation.lams.tool.scratchie.dto.QbOptionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.OptionDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
@@ -145,7 +145,7 @@
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
 	Long itemUid = WebUtil.readLongParam(request, ScratchieConstants.ATTR_ITEM_UID);
-	if (itemUid.equals(-1)) {
+	if (itemUid.equals(-1L)) {
 	    return null;
 	}
 	ScratchieItem item = scratchieService.getScratchieItemByUid(itemUid);
@@ -156,10 +156,12 @@
 
 	// escape JS sensitive characters in option descriptions
 	for (GroupSummary summary : summaryList) {
-	    for (QbOptionDTO optionDto : summary.getOptionDtos()) {
-		String description = (optionDto.getQbOption().getName() == null) ? ""
-			: StringEscapeUtils.escapeJavaScript(optionDto.getQbOption().getName());
-		optionDto.getQbOption().setName(description);
+	    for (OptionDTO optionDto : summary.getOptionDtos()) {
+		if (optionDto.getQbOption() != null) {
+		    String optionName = optionDto.getQbOption().getName() == null ? ""
+			    : StringEscapeUtils.escapeJavaScript(optionDto.getQbOption().getName());
+		    optionDto.getQbOption().setName(optionName);
+		}
 	    }
 	}
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
===================================================================
diff -u -r23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision 23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -46,7 +46,7 @@
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
-import org.lamsfoundation.lams.tool.scratchie.dto.QbOptionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.OptionDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.ScratchieItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
@@ -163,12 +163,12 @@
 		String optionsSequence = groupRow[i].getCellValue().toString();
 		String[] optionLetters = optionsSequence.split(", ");
 
-		List<QbOptionDTO> optionDtos = new LinkedList<>();
+		List<OptionDTO> optionDtos = new LinkedList<>();
 		for (int j = 0; j < optionLetters.length; j++) {
 		    String optionLetter = optionLetters[j];
 		    String correctOptionLetter = correctOptionsRow[i].getCellValue().toString();
 
-		    QbOptionDTO optionDto = new QbOptionDTO();
+		    OptionDTO optionDto = new OptionDTO();
 		    QbOption qbOption = new QbOption();
 		    optionDto.setQbOption(qbOption);
 		    qbOption.setName(optionLetter);
Index: lams_tool_scratchie/web/includes/css/scratchie-learning.scss
===================================================================
diff -u -r4f8d2a6c0dba8057f24e88b943099de10947985a -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision 4f8d2a6c0dba8057f24e88b943099de10947985a)
+++ lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(.../scratchie-learning.scss)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -1,14 +1,14 @@
 @import "_lams_variables.scss";
 	
-#scratches {
+.scratches {
 	margin: 40px 0 15px;
 }
 
-#scratches tr td {
+.scratches tr td {
 	padding: 12px 15px;
 }
 
-#scratches a, #scratches a:hover {
+.scratches a, .scratches a:hover {
 	border-bottom: none;
 }
 
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -1,7 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMapID" value="${authoringForm.sessionMapID}" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="confidenceLevelsActivities" value="${sessionMap.confidenceLevelsActivities}" />
+<c:set var="activitiesProvidingConfidenceLevels" value="${sessionMap.activitiesProvidingConfidenceLevels}" />
+<c:set var="activitiesProvidingVsaAnswers" value="${sessionMap.activitiesProvidingVsaAnswers}" />
 
 <script lang="javascript">
 	$(document).ready(function(){
@@ -10,6 +11,10 @@
 		});
 		<c:if test="${authoringForm.scratchie.confidenceLevelsActivityUiid == null}">$("#confidence-levels-activity").prop('disabled','disabled'); </c:if>
 		
+		$("#display-activities-providing-vsa-answers").click(function() {
+			$("#activity-providing-vsa-answers").prop("disabled", !$(this).is(':checked'));
+		});
+		<c:if test="${authoringForm.scratchie.activityUiidProvidingVsaAnswers == null}">$("#activity-providing-vsa-answers").prop('disabled','disabled'); </c:if>
 		
 		$("#overwrite-preset-marks").click(function() {
 			$("#preset-marks").prop("disabled", !$(this).is(':checked'));
@@ -66,14 +71,14 @@
 	</div>
 	
 	<div class="checkbox">
-		<c:if test="${confidenceLevelsActivities == null}">
+		<c:if test="${activitiesProvidingConfidenceLevels == null}">
 			<div class="alert-warning" style="margin-bottom: 5px;">
 				<fmt:message key="label.save.learning.design" />
 			</div>
 		</c:if>
 		
 		<c:choose>
-			<c:when test="${fn:length(confidenceLevelsActivities) == 0}">
+			<c:when test="${fn:length(activitiesProvidingConfidenceLevels) == 0}">
 				<fmt:message key="label.no.confidence.levels.activities" />
 			</c:when>
 				
@@ -85,14 +90,37 @@
 				
 					<fmt:message key="label.show.confidence.level" />&nbsp;
 					<form:select path="scratchie.confidenceLevelsActivityUiid" cssClass="form-control input-sm" id="confidence-levels-activity">
-						<c:forEach var="confidenceProvidingActivity" items="${confidenceLevelsActivities}">
+						<c:forEach var="confidenceProvidingActivity" items="${activitiesProvidingConfidenceLevels}">
 							<form:option value="${confidenceProvidingActivity.activityUIID}">${confidenceProvidingActivity.title}</form:option>
 						</c:forEach>
 					</form:select>
 				</label>
 			</c:otherwise>
 		</c:choose>
 	</div>
+	
+	<div class="checkbox">
+		<c:choose>
+			<c:when test="${fn:length(activitiesProvidingVsaAnswers) == 0}">
+				<fmt:message key="label.no.activities.provide.vsa.answers" />
+			</c:when>
+				
+			<c:otherwise>
+				<label for="display-activities-providing-vsa-answers">
+					<input type="checkbox" id="display-activities-providing-vsa-answers"
+							<c:if test="${authoringForm.scratchie.activityUiidProvidingVsaAnswers != null}">checked="true"</c:if>
+					/>
+				
+					<fmt:message key="label.show.vsa.answers" />&nbsp;
+					<form:select path="scratchie.activityUiidProvidingVsaAnswers" cssClass="form-control input-sm" id="activity-providing-vsa-answers">
+						<c:forEach var="activityProvidingVsaAnswers" items="${activitiesProvidingVsaAnswers}">
+							<form:option value="${activityProvidingVsaAnswers.activityUIID}">${activityProvidingVsaAnswers.title}</form:option>
+						</c:forEach>
+					</form:select>
+				</label>
+			</c:otherwise>
+		</c:choose>
+	</div>
 </lams:SimplePanel>
 
 <c:set var="adTitle"><fmt:message key="label.change.marking.allocation" /></c:set>
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 06d090eefddaafa108bcd8614d47d3d92f946210)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -11,11 +11,11 @@
 	<%@ include file="/common/tabbedheader.jsp"%>
 	<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
 	<style type="text/css">
-		#confidence-levels-activity {
+		#confidence-levels-activity, #activity-providing-vsa-answers {
 			display: inline-block;
 			width: 200px;
 		}
-		#display-confidence-levels-activities {
+		#display-confidence-levels-activities, #display-activities-providing-vsa-answers {
 			margin-top: 8px;
 		}
 		#question-bank-div {
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 06d090eefddaafa108bcd8614d47d3d92f946210)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -68,6 +68,15 @@
 			}
 		);
 	}
+	function initNewItemHref() {
+		var itemTypeDropdown = document.getElementById("item-type");
+		var itemType = itemTypeDropdown.value;
+		
+		var newItemInitHref = "<c:url value='/authoring/addItem.do'/>?sessionMapID=${sessionMapID}"
+			+ "&questionType=" + itemType 
+			+ "&KeepThis=true&TB_iframe=true&modal=true";
+		$("#item-init-href").attr("href", newItemInitHref);
+	};
 	
 	function refreshThickbox(){
 		tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
@@ -90,14 +99,15 @@
 </div>
 
 <c:if test="${!isAuthoringRestricted}">
+	<!-- Dropdown menu for choosing a question type -->
 	<div id="add-question-div" class="form-inline form-group pull-right">
-		<c:set var="addItemUrl" >
-			<c:url value='/authoring/addItem.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&modal=true
-		</c:set>
-		<a href="${addItemUrl}" class="btn btn-default btn-sm thickbox">
+		<select id="item-type" class="form-control input-sm">
+			<option selected="selected" value="1"><fmt:message key="label.type.multiple.choice" /></option>
+			<option value="3"><fmt:message key="label.type.short.answer" /></option>
+		</select>
+		
+		<a onclick="initNewItemHref();return false;" href="#nogo" class="btn btn-default btn-sm thickbox" id="item-init-href">  
 			<i class="fa fa-lg fa-plus-circle" aria-hidden="true" title="<fmt:message key="label.authoring.basic.add.another.scratchie" />"></i>
-			&nbsp;
-			<fmt:message key="label.authoring.basic.add.another.scratchie" />
 		</a>
 	</div>
 	
Index: lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/authoring/parts/addItemFooter.jsp	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,29 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<footer class="footer fixed-bottom">
+	<div class="panel-heading ">
+       	<div class="col-xs-12x col-md-6x form-groupx rowx form-inlinex btn-group-md voffset5">
+       		<span>
+	       		Collection
+	        		
+				<select class="btn btn-md btn-default" id="collection-uid-select">
+					<c:forEach var="collection" items="${scratchieItemForm.userCollections}">
+						<option value="${collection.uid}"
+							<c:if test="${collection.uid == scratchieItemForm.oldCollectionUid}">selected="selected"</c:if>>
+							<c:out value="${collection.name}" />
+						</option>
+					</c:forEach>
+				</select>
+			</span>
+				
+        	<div class="pull-right col-xs-12x col-md-6x" style="margin-top: -5px;">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.authoring.cancel.button" />
+				</a>
+				<a href="#nogo" onclick="javascript:$('#scratchieItemForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.save.button" />
+				</a>
+			</div>
+		</div>
+   	</div>
+</footer>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/authoring/parts/addMcq.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/authoring/parts/addMcq.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/authoring/parts/addMcq.jsp	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,267 @@
+<!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="isAuthoringRestricted" value="${sessionMap.mode == 'teacher'}" />
+
+<lams:html>
+	<lams:head>
+		<%@ include file="/common/header.jsp"%>
+		<link href="<lams:LAMSURL/>css/qb-question.css" rel="stylesheet" type="text/css">
+		<link href="<lams:WebAppURL/>includes/css/scratchie.css" rel="stylesheet" type="text/css" media="screen">
+
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+		<script type="text/javascript">
+			var addAnswerUrl = "<c:url value='/authoring/addAnswer.do'/>";
+		   	var removeAnswerUrl = "<c:url value='/authoring/removeAnswer.do'/>";
+    	    var upAnswerUrl = "<c:url value='/authoring/upAnswer.do'/>";
+    	    var downAnswerUrl = "<c:url value='/authoring/downAnswer.do'/>";
+    	    
+    		/*
+    		 This is Scratchie Item answer area.
+    		 */
+    		var answerTargetDiv = "#answerArea";
+    		function addAnswer(){
+
+    			//check maximum number of options
+    			var numberOfAnswers = $("textarea[name^=optionDescription]").length;
+    			if (numberOfAnswers >= 10) {
+    				alert("<fmt:message key="label.authoring.maximum.answers.warning" />");
+    				return;
+    			}
+    			
+    			//store old InstanceIds before doing Ajax call. We need to keep record of old ones to prevent reinitializing new CKEditor two times.
+    			var oldAnswerIds = new Array();
+    	 		for (var instanceId in CKEDITOR.instances){
+    				oldAnswerIds[instanceId] = instanceId;
+    			}
+    			
+    			var url= addAnswerUrl;
+    			var contentFolderID= $("#contentFolderID").val();
+    			prepareAnswerEditorsForAjaxSubmit();
+    			var optionList = $("#answerForm").serialize(true);
+    			$.ajaxSetup({ cache: true });
+    			$(answerTargetDiv).load(
+    				url,
+    				{
+    					contentFolderID: contentFolderID,
+    					optionList: optionList 
+    				},
+    				function(){
+    					reinitializeAnswerEditors(oldAnswerIds);
+    				}
+    			);
+    		}
+    		function removeAnswer(idx){
+    	 		var url= removeAnswerUrl;
+    			var contentFolderID= $("#contentFolderID").val();
+    			prepareAnswerEditorsForAjaxSubmit();
+    	 		var optionList = $("#answerForm").serialize(true);
+    			$(answerTargetDiv).load(
+    					url,
+    					{
+    						contentFolderID: contentFolderID,
+    						optionIndex: idx,
+    						optionList: optionList 
+    					},
+    					function(){
+    						reinitializeAnswerEditors(null);
+    					}
+    			);
+    		}
+    		function upAnswer(idx){
+    	 		var url= upAnswerUrl;
+    			var contentFolderID= $("#contentFolderID").val();
+    			prepareAnswerEditorsForAjaxSubmit();
+    	 		var optionList = $("#answerForm").serialize(true);
+    			$(answerTargetDiv).load(
+    					url,
+    					{
+    						contentFolderID: contentFolderID,
+    						optionIndex: idx,
+    						optionList: optionList 
+    					},
+    					function(){
+    						reinitializeAnswerEditors(null);
+    					}
+    			);
+    		}
+    		function downAnswer(idx){
+    	 		var url= downAnswerUrl;
+    			var contentFolderID= $("#contentFolderID").val(); 	
+    			prepareAnswerEditorsForAjaxSubmit();
+    	 		var optionList = $("#answerForm").serialize(true);
+    	 		$(answerTargetDiv).load(
+    					url,
+    					{
+    						contentFolderID: contentFolderID,
+    						optionIndex: idx,
+    						optionList: optionList 
+    					},
+    					function(){
+    						reinitializeAnswerEditors(null);
+    					}
+    			);
+    		}
+    		
+    		//reinitialize all CKEditors responsible for options after Ajax call has done
+    		function reinitializeAnswerEditors(answerIds){
+    			return;
+    			if (answerIds == null) {
+    				answerIds = CKEDITOR.instances;
+    			}
+    			
+    			for (var instanceId in answerIds){
+    				//skip general fckeditors
+    				if (instanceId.match("^(description)")) { 
+    					if (instanceId == null) continue;
+    					var instance = CKEDITOR.instances[instanceId];
+    					if (instance == null) continue;
+    					var initializeFunction = instance.initializeFunction;
+    					CKEDITOR.remove(instance);
+    					//don't initialize elements that were deleted
+    					if ($("#" + instanceId).length == 0) continue;
+    					instance = initializeFunction();
+    					instance.initializeFunction = initializeFunction;
+    				}
+    			}
+    		}
+    		
+    		//in order to be able to use answer's value, copy it from CKEditor to textarea
+    		function prepareAnswerEditorsForAjaxSubmit(){
+    			$("textarea[name^=optionDescription]").each(function() {
+    	    		var ckeditorData = CKEDITOR.instances[this.name].getData();
+    	    		//skip out empty values
+    	    		this.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;
+    			});
+    		}
+			$(document).ready(function(){
+				
+		    	$("#scratchieItemForm").validate({
+		    		ignore : 'div.cke_editable',
+		    		rules: {
+		    			title: "required",
+		    			hasAnswerFilled: {
+		    				required: function(element) {
+		    					//check there should be at least one answer filled
+				    			prepareAnswerEditorsForAjaxSubmit();
+		    		        	return $("textarea[name^=optionDescription]:filled").length < 1;
+			    		    }
+	    			    },
+	    			    hasFilledCorrectAnswer: {
+		    				required: function(element) {
+		    					//check one answer should be selected as correct (and be filled at the same time)
+		    					prepareAnswerEditorsForAjaxSubmit();
+		    					
+		    					var hasFilledCorrectAnswer = false;
+		    					$("input[name^=optionCorrect]:checked").each(function() {
+		    						var statusIndex = this.alt;
+		    						var optionDescription = $("textarea[name=optionDescription" + statusIndex + "]");
+		    						hasFilledCorrectAnswer = optionDescription.val() != "";
+		    					});
+		    					
+		    		        	return !hasFilledCorrectAnswer;
+			    		    }
+	    			    }
+		    		},
+		    		messages: {
+		    			title: "<fmt:message key='label.authoring.title.required'/>",
+		    			hasAnswerFilled: "<fmt:message key='label.authoring.error.possible.answer'/>",
+		    			hasFilledCorrectAnswer: "<fmt:message key='label.authoring.error.correct.answer'/>"
+		    		},
+		    	    invalidHandler: function(form, validator) {
+		    		      var errors = validator.numberOfInvalids();
+		    		      if (errors) {
+		    		          var message = errors == 1
+		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
+		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
+	    		          	  
+		    		          $("div.error span").html(message);
+		    		          $("div.error").show();
+		    		      } else {
+		    		          $("div.error").hide();
+		    		      }
+		    		},
+		    		debug: false,
+     			    submitHandler: function(form) {
+     			    	prepareAnswerEditorsForAjaxSubmit();
+		    			$("#optionList").val($("#answerForm").serialize(true));
+		    			$("#description").val(CKEDITOR.instances.description.getData());
+		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
+		    			
+		    	    	var options = { 
+		    	    		target:  parent.jQuery('#itemArea'), 
+		    		   		success: function (responseText, statusText)  { 
+		    	    			self.parent.refreshThickbox()
+		    	    			self.parent.tb_remove();
+		    	    		} 
+		    		    };
+		    		    				
+		    			$('#scratchieItemForm').ajaxSubmit(options);
+		    		}
+		  		});
+			});   
+  		</script>
+		
+	</lams:head>
+	
+	<body>
+			
+		<div class="panel-default add-file">
+			<div class="panel-heading">
+				<div class="panel-title panel-learner-title">
+					<fmt:message key="label.edit.question" />
+				</div>
+			</div>
+			
+			<div class="panel-body panel-${type}-body">
+	
+			<lams:errors/>
+			
+			<form:form action="/lams/tool/lascrt11/authoring/saveItem.do" method="post" modelAttribute="scratchieItemForm" id="scratchieItemForm">
+				<form:hidden path="sessionMapID" />
+				<input type="hidden" name="optionList" id="optionList" />
+				<form:hidden path="itemIndex" />
+				<form:hidden path="questionType"/>
+				<form:hidden path="contentFolderID" id="contentFolderID"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
+	
+				<div id="title-container" class="form-group">
+					<c:set var="TITLE_LABEL"><fmt:message key="label.authoring.basic.question.name"/> </c:set>
+					<form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255" 
+					    	placeholder="${TITLE_LABEL}"/>
+				</div>
+
+				<div class="form-group form-group-cke">
+					<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.authoring.basic.question.text"/></c:set>
+					<lams:CKEditor id="description" value="${scratchieItemForm.description}" contentFolderID="${scratchieItemForm.contentFolderID}" 
+						placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+				</div>
+
+				<label for="hasAnswerFilled" class="error" style="display: none;"></label>
+				<input type="text" name="hasAnswerFilled" id="hasAnswerFilled" class="fake-validation-input" >
+				<label for="hasFilledCorrectAnswer" class="error" style="display: none;"></label>
+				<input type="text" name="hasFilledCorrectAnswer" id="hasFilledCorrectAnswer" class="fake-validation-input">
+			
+			</form:form>
+			
+			<!-- Options -->
+			<form id="answerForm" name="answerForm">
+ 				<%@ include file="optionlist.jsp"%>
+ 				
+ 				<div>
+	 				<a href="javascript:;" onclick="addAnswer();" class="btn btn-default btn-sm pull-right">
+						<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.add.blank.answer" /> 
+					</a>
+				</div>
+			</form>
+
+			</div>
+		</div>
+		
+		<%@ include file="addItemFooter.jsp"%>
+					
+	</body>
+</lams:html>
Index: lams_tool_scratchie/web/pages/authoring/parts/addVsa.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/authoring/parts/addVsa.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/authoring/parts/addVsa.jsp	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,237 @@
+<!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="3"	scope="request" />
+
+<lams:html>
+	<lams:head>
+	
+		<%@ include file="/common/header.jsp"%>
+		<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />
+		<link href="<lams:LAMSURL/>css/qb-question.css" rel="stylesheet" type="text/css">
+		<link href="<lams:WebAppURL/>includes/css/scratchie.css" rel="stylesheet" type="text/css" media="screen">
+		<style>
+			textarea {
+			  resize: none;
+			}
+		</style>
+
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+
+		
+		
+<script type="text/javascript">
+	const QUESTION_TYPE = 3;
+	const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
+	const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+</script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/qb-question.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/qb-option.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.slider.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.touch-punch.js"></script>
+		
+  	    <script>
+			$(document).ready(function(){
+		    	$("#scratchieItemForm").validate({
+		    		ignore: 'hidden, div.cke_editable',
+		    		rules: {
+		    			title: "required",
+		    			hasTwoOptionsFilled: {
+		    				required: function(element) {
+		    		        	return $("textarea[name^=optionName]:filled").length != 2;
+			    		    }			    		    
+	    			    }
+		    		},
+		    		messages: {
+		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    			hasTwoOptionsFilled: "<fmt:message key='label.error.two.answers.required'/>"
+		    		},
+     			    submitHandler: function(form) {
+     			    	prepareOptionEditorsForAjaxSubmit();     			    
+		    			$("#optionList").val($("#optionForm").serialize(true));
+		    			$("#description").val(CKEDITOR.instances.description.getData());
+		    			$("#feedback").val(CKEDITOR.instances.feedback.getData());
+		    			$("#new-collection-uid").val($("#collection-uid-select option:selected").val());
+		    			
+		    	    	var options = { 
+		    	    		target:  parent.jQuery('#itemArea'), 
+		    		   		success: function (responseText, statusText)  { 
+		    	    			self.parent.refreshThickbox()
+		    	    			self.parent.tb_remove();
+		    	    		} 
+		    		    }; 				
+		    		    				
+		    			$('#scratchieItemForm').ajaxSubmit(options);
+		    		},
+		    		invalidHandler: formValidationInvalidHandler,
+					errorElement: "em",
+					errorPlacement: formValidationErrorPlacement,
+					success: formValidationSuccess,
+					highlight: formValidationHighlight,
+					unhighlight: formValidationUnhighlight
+		  		});
+			});
+
+			function autoGrowTextarea(element) {
+			    element.style.height = "75px";
+			    element.style.height = (element.scrollHeight)+"px";
+			}
+  		</script>
+</lams:head>
+<body>
+	<div class="panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.type.short.answer" />
+		</div>
+
+		<div class="panel-body">
+			
+			<form:form action="/lams/tool/lascrt11/authoring/saveItem.do" method="post" modelAttribute="scratchieItemForm" id="scratchieItemForm">
+				<form:hidden path="sessionMapID" />
+				<input type="hidden" name="optionList" id="optionList" />
+				<form:hidden path="itemIndex" />
+				<form:hidden path="questionType"/>
+				<form:hidden path="contentFolderID" id="contentFolderID"/>
+				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
+				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
+
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
+				
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+					
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.authoring.basic.question.name"/> </c:set>
+					    <form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255"
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
+				
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.authoring.basic.question.text"/></c:set>
+						<lams:CKEditor id="description" value="${scratchieItemForm.description}" contentFolderID="${scratchieItemForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
+					
+					<div>
+						<input type="text" name="hasTwoOptionsFilled" id="hasTwoOptionsFilled" class="fake-validation-input">
+					</div>
+				</div>
+				
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+				
+					<div>
+						<label class="switch">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="answer-required">
+							<fmt:message key="label.answer.required" />
+						</label>
+					</div>
+					
+					<div class="form-group row form-inline">
+						<label for="caseSensitive" class="col-sm-3 voffset10">
+							<fmt:message key="label.case.sensitivity" />
+						</label>
+						
+						<div class="col-sm-9">
+							<form:select path="caseSensitive" id="caseSensitive" cssClass="form-control input-sm">
+								<form:option value="false"><fmt:message key="label.no.case.unimportant" /></form:option>
+								<form:option value="true"><fmt:message key="label.yes.case.must.match" /></form:option>
+							</form:select>
+						</div>
+					</div>
+
+					<div>
+						<label class="switch">
+							<form:checkbox path="autocompleteEnabled" id="autocomplete-enabled"/>
+							<span class="switch-slider round"></span>
+						</label>
+						<label for="autocomplete-enabled">
+							<fmt:message key="label.autocomplete.as.student" />
+						</label>
+					</div>
+	
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.general.feedback"/></c:set>
+						<lams:CKEditor id="feedback" value="${scratchieItemForm.feedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${scratchieItemForm.contentFolderID}" />
+					</div>
+				</div>
+
+			</form:form>
+			
+			<!-- Options -->
+			<div class="question-tab">
+				<form id="optionForm" name="optionForm">
+				<div id="optionArea">
+					<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
+					<input type="hidden" name="optionCount" id="optionCount" value="2">
+					
+					<div id="option-table">
+						<c:forEach var="option" items="${optionList}" varStatus="status">
+							<table id="option-table-${status.index}" class="voffset10-bottom" data-id="${status.index}" tabindex="1">
+								<tr>									
+									<td>
+										<input type="hidden" name="optionDisplayOrder${status.index}" value="${option.displayOrder}">
+										<input type="hidden" name="optionUid${status.index}" value="${option.uid}">
+										
+										<div class="form-group">
+											
+											<c:choose>
+												<c:when test="${status.index == 0}">
+													<c:set var="OPTION_LABEL">
+														<fmt:message key="label.correct.answers" />
+													</c:set>
+												</c:when>
+												<c:otherwise>
+													<c:set var="OPTION_LABEL">
+														<fmt:message key="label.incorrect.answers" />
+													</c:set>
+												</c:otherwise>
+											</c:choose>
+											<div style="color: #999 !important;">
+												${OPTION_LABEL}
+											</div>
+											
+											<textarea name="optionName${status.index}" rows="3" class="form-control borderless-text-input2"
+												oninput="autoGrowTextarea(this)"
+												><c:out value='${option.name}' /></textarea>
+												
+											<div class="voffset10 voffset5-bottom">
+											   	<c:set var="FEEDBACK_LABEL"><fmt:message key="label.option.feedback"/></c:set>
+											   	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" 
+											     	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="50px"/>
+											</div>
+										</div>
+									</td>
+								</tr>
+							</table>
+						</c:forEach>
+					</div>
+				</div>
+				</form>	
+			</div>	
+
+		</div>	
+	</div>	
+	
+	<%@ include file="addItemFooter.jsp"%>
+</body>
+</lams:html>
Fisheye: Tag e8a7110708b15579af2c6b31ac52a6da427fef6d refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/authoring/parts/additem.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 06d090eefddaafa108bcd8614d47d3d92f946210)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -39,7 +39,18 @@
 					
 				    <span class='pull-right alert-info btn-xs loffset5 roffset5'>
 				    	v.&nbsp;${item.qbQuestion.version}
-				    </span>		
+				    </span>
+				    
+				   	<span class='pull-right alert-info btn-xs'>
+						<c:choose>
+							<c:when test="${item.qbQuestion.type == 1}">
+								<fmt:message key="label.type.multiple.choice" />
+							</c:when>
+							<c:when test="${item.qbQuestion.type == 3}">
+								<fmt:message key="label.type.short.answer" />
+							</c:when>
+						</c:choose>
+	       			</span>
 				</td>
 				
 				<c:if test="${!isAuthoringRestricted}">
Index: lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -r06d090eefddaafa108bcd8614d47d3d92f946210 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 06d090eefddaafa108bcd8614d47d3d92f946210)
+++ lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -7,13 +7,13 @@
 		<c:forEach var="answer" items="${optionList}" varStatus="status">
 			<tr>
 				<td class="text-center" style="width:5%">
-					<input type="hidden" name="optionOrderId${status.index}" id="optionOrderId${status.index}" value="${answer.displayOrder}">
+					<input type="hidden" name="optionDisplayOrder${status.index}" id="optionDisplayOrder${status.index}" value="${answer.displayOrder}">
 					<input type="hidden" name="optionUid${status.index}" id="optionUid${status.index}" value="${answer.uid}">
 					<span class="field-name">&#${status.index + 65};)</span>
 				</td>
 				
 				<td style="background:none;">	
-					<lams:CKEditor id="optionDescription${status.index}" value="${answer.name}" contentFolderID="${contentFolderID}" />					
+					<lams:CKEditor id="optionName${status.index}" value="${answer.name}" contentFolderID="${contentFolderID}" />					
 				</td>
 				
 				<td class="text-right" style="width:15%">
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -1,15 +1,11 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 <%-- param has higher level for request attribute --%>
 <c:if test="${not empty param.sessionMapID}">
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 </c:if>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-
 <c:set var="mode" value="${sessionMap.mode}" />
 <c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
 <c:set var="scratchie" value="${sessionMap.scratchie}" />
@@ -18,21 +14,21 @@
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
-
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<!-- ********************  CSS ********************** -->
 	<lams:css />
+	<link rel="stylesheet" type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" />
 	<link href="<lams:WebAppURL/>includes/css/scratchie.css" rel="stylesheet" type="text/css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.jgrowl.css" />
 	<link rel="stylesheet" type="text/css" href="${lams}css/circle.css" />
 	<link rel="stylesheet" type="text/css" href="<lams:WebAppURL/>includes/css/scratchie-learning.css" />
 	<style type="text/css">
-
 	</style>
 
 	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script>
 		//Resolve name collision between jQuery UI and Twitter Bootstrap
@@ -47,55 +43,202 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript">
+		var assessmentAnswers = new Map([
+			<c:forEach var="item" items="${sessionMap.itemList}">
+				[${item.uid}, [
+				<c:forEach var="optionDto" items="${item.optionDtos}" varStatus="status">
+					 <c:if test="${not empty optionDto.answer}">"${optionDto.answer}",</c:if>
+				</c:forEach>
+				]],
+			</c:forEach>
+		]);
 
 		$(document).ready(function(){
 			//initialize tooltips showing user names next to confidence levels
 			$('[data-toggle="tooltip"]').tooltip();
+
+			//handler for VSA input fields
+			$('.submit-user-answer-input').keypress(function(event){
+				var keycode = (event.keyCode ? event.keyCode : event.which);
+				if(keycode == '13') {
+					var itemUid = $(this).data("item-uid");
+					scratchVsa(itemUid);
+					return false;
+				}
+			});
+
+			//handler for VSA submit buttons
+			$(".submit-user-answer").on('click', function(){
+				var itemUid = $(this).data("item-uid");
+				scratchVsa(itemUid);
+				return false;
+			});
+
+			//autocomplete for VSA
+			$('.ui-autocomplete-input').each(function(){
+				$(this).autocomplete({
+					'source' : '<c:url value="/learning/vsaAutocomplete.do"/>?itemUid=' + $(this).data("item-uid"),
+					'delay'  : 500,
+					'minLength' : 3
+				});
+			});
 		});
-	
+
+		//scratch image (used by both scratchMcq() and scratchVsa())
 		function scratchImage(itemUid, optionUid, isCorrect) {
 			// first show animation, then put static image
 			var imageSuffix = isCorrect ? 'correct' : 'wrong';
-	    		$('#image-' + itemUid + '-' + optionUid).load(function(){
-	    			var image = $(this).off("load");
-	    			// show static image after animation
-	    			setTimeout(
-	    	    			function(){
-	    					image.attr("src", "<lams:WebAppURL/>includes/images/scratchie-" + imageSuffix + ".png");
-	    				}, 
-	    				1300
-	    			);
-	    		}).attr("src", "<lams:WebAppURL/>includes/images/scratchie-" + imageSuffix + "-animation.gif");
+			var image = $('#image-' + itemUid + '-' + optionUid);
+
+			//show VSA question image 
+			if (image.css('visibility') != 'visible') {
+				image.css('visibility', 'visible');
+			}
+			
+			image.load(function(){
+	    		var image = $(this).off("load");
+	    		// show static image after animation
+	    		setTimeout(
+	    			function(){
+	    				image.attr("src", "<lams:WebAppURL/>includes/images/scratchie-" + imageSuffix + ".png");
+	    			}, 
+	    			1300
+	    		);
+	    	}).attr("src", "<lams:WebAppURL/>includes/images/scratchie-" + imageSuffix + "-animation.gif");
 		}
 
-		function scratchItem(itemUid, optionUid){
+		//scratch MCQ answer
+		function scratchMcq(itemUid, optionUid){
 	        $.ajax({
 	            url: '<c:url value="/learning/recordItemScratched.do"/>',
 	            data: 'sessionMapID=${sessionMapID}&optionUid=' + optionUid + '&itemUid=' + itemUid,
 	            dataType: 'json',
 	            type: 'post',
 	            success: function (json) {
-		            	if (json == null) {
-		            		return false;
-		            	}
+		            if (json == null) {
+		            	return false;
+		            }
 		            	
-		            	scratchImage(itemUid, optionUid, json.optionCorrect);
+		            scratchImage(itemUid, optionUid, json.optionCorrect);
 		            	
-		            	if (json.optionCorrect) {
-		            		//disable scratching
-		            		$("[id^=imageLink-" + itemUid + "]").removeAttr('onclick'); 
-		            		$("[id^=imageLink-" + itemUid + "]").css('cursor','default');
-		            		$("[id^=image-" + itemUid + "]").not("img[src*='scratchie-correct-animation.gif']").not("img[src*='scratchie-correct.gif']").fadeTo(1300, 0.3);
+		            if (json.optionCorrect) {
+		            	//disable scratching
+		            	$("[id^=imageLink-" + itemUid + "]").removeAttr('onclick'); 
+		            	$("[id^=imageLink-" + itemUid + "]").css('cursor','default');
+		            	$("[id^=image-" + itemUid + "]").not("img[src*='scratchie-correct-animation.gif']").not("img[src*='scratchie-correct.gif']").fadeTo(1300, 0.3);
 
-		            	} else {
-		            		var id = '-' + itemUid + '-' + optionUid;
-		            		$('#imageLink' + id).removeAttr('onclick');
-		            		$('#imageLink' + id).css('cursor','default');
-		            	}
+		            } else {
+		            	var id = '-' + itemUid + '-' + optionUid;
+		            	$('#imageLink' + id).removeAttr('onclick');
+		            	$('#imageLink' + id).css('cursor','default');
+		            }
 	            }
 	       	});
 		}
 
+		//scratch VSA answer
+		function scratchVsa(itemUid) {
+			var input = $("#input-" + itemUid),
+				answer = input.val();
+
+			if (answer == "") {
+				return;
+			}
+
+			//determine if such answer is available in the list
+			var answerRowIndex = -1;
+			assessmentAnswers.get(itemUid).forEach(function(assessmentAnswer, index) {
+				if (assessmentAnswer == answer) {
+					answerRowIndex = index;
+				}
+			});
+
+			var isRecordVsaAnswerRequired = true;
+			if (answerRowIndex != -1) {
+				var isScrathed = $('tr#tr-' + answerRowIndex + ' img[src*="scratchie-correct.png"], tr#tr-' + answerRowIndex + ' img[src*="scratchie-wrong.png"]', "#scratches-" + itemUid).length > 0;
+				//highlight already scratched answer
+				if (isScrathed) {
+					var tableRowTohighlight = $("tr#tr-" + answerRowIndex, "#scratches-" + itemUid);
+					$([document.documentElement, document.body]).animate(
+						{
+				        	scrollTop: tableRowTohighlight.offset().top
+				    	}, 
+				    	1000, 
+				    	function() {
+				    		tableRowTohighlight.effect("highlight", 1500);
+				    	}
+				    );
+						
+					isRecordVsaAnswerRequired = false;
+				}
+
+			//if answer is not available in the list, add it to the list
+			} else {
+				paintNewVsaAnswer(itemUid, answer);
+			}
+
+			if (isRecordVsaAnswerRequired) {
+				$.ajax({
+			    	url: '<c:url value="/learning/recordVsaAnswer.do"/>',
+			        data: {
+			           	sessionMapID: "${sessionMapID}", 
+			           	itemUid: itemUid,
+			           	answer: answer 
+					},
+			        dataType: 'json',
+			        type: 'post',
+			        success: function (json) {
+				    	if (json == null) {
+				           	return false;
+				        }
+
+				        scratchImage(itemUid, hashCode(answer), json.isAnswerCorrect);
+				            	
+				        if (json.isAnswerCorrect) {
+				           	//disable further answering
+				           	$("[id^=image-" + itemUid + "]").not("img[src*='scratchie-correct-animation.gif']").not("img[src*='scratchie-correct.gif']").fadeTo(1300, 0.3);
+					            
+					        //disable submit button
+				           	$("#type-your-answer-" + itemUid).hide();
+				        }
+			        }
+		       	});
+			}
+
+	        //blank input field
+			input.val("");
+		}
+
+		//add new VSA answer to the table (required in case user entered answer not present in the previous answers)
+		function paintNewVsaAnswer(itemUid, answer) {
+			var answerRowIndex = assessmentAnswers.get(itemUid).length;
+			
+			var trElem = 
+				'<tr id="tr-' + answerRowIndex + '">' +
+					'<td style="width: 40px; border: none;">' +
+						'<img src="<lams:WebAppURL/>includes/images/answer-' + answerRowIndex + '.png" class="scartchie-image" id="image-' + itemUid + '-' + hashCode(answer) + '" />' +
+					'</td>' +
+
+					'<td class="answer-with-confidence-level-portrait">' +
+						'<div class="answer-description">' +
+							answer +
+						'</div>' +
+						'<hr class="hr-confidence-level" />' +
+						'<div style="padding-bottom: 10px;">' +
+							'<lams:Portrait userId="${sessionMap.groupLeaderUserId}"/>' +
+						'</div>' +
+					'</td>' +
+				'</tr>';
+			$("table#scratches-" + itemUid).append(trElem);
+			assessmentAnswers.get(itemUid).push(answer);
+		}
+
+		//a direct replacement for Java's String.hashCode() method 
+		function hashCode(str) {
+			return str.split('').reduce((prevHash, currVal) =>
+		    	(((prevHash << 5) - prevHash) + currVal.charCodeAt(0))|0, 0);
+		}
+
 		//boolean to indicate whether ok dialog is still ON so that autosave can't be run
 		var isWaitingForConfirmation = ${isTimeLimitEnabled && isTimeLimitNotLaunched};
 
@@ -118,7 +261,7 @@
 				    	
 			        		//store date when user has started activity with time limit
 				        $.ajax({
-				        		async: true,
+				        	async: true,
 				            url: '<c:url value="/learning/launchTimeLimit.do"/>',
 				            data: 'sessionMapID=${sessionMapID}',
 				            type: 'post'
@@ -179,7 +322,6 @@
 
 		//autosave feature
 		<c:if test="${isUserLeader && (mode != 'teacher')}">
-			
 			var autosaveInterval = "60000"; // 60 seconds interval
 			window.setInterval(
 				function(){
@@ -195,8 +337,8 @@
 			                	);
 		                }
 					});
-	        		}, 
-	        		autosaveInterval
+	        	}, 
+	        	autosaveInterval
 	        );
 		</c:if>
 
@@ -206,16 +348,16 @@
 			var proceed = true;
 			//ask for leave confirmation only if time limit is not expired
 			if (!isTimelimitExpired) {
-				var numberOfAvailableScratches = $("[id^=imageLink-][onclick]").length;
+				var numberOfAvailableScratches = $("[id^=imageLink-][onclick], [id^=type-your-answer-]").length;
 				proceed = (numberOfAvailableScratches > 0) ? confirm("<fmt:message key="label.one.or.more.questions.not.completed"></fmt:message>") : true;	
 			}
 			
 			if (proceed) {
 				document.getElementById("finishButton").disabled = true;
 
-		        	var myForm = $('#burning-questions');
-		        	myForm.attr("action", '<lams:WebAppURL />learning/' + method + '.do?sessionMapID=${sessionMapID}&date=' + new Date().getTime());
-		        	myForm.submit();
+		        var myForm = $('#burning-questions');
+		        myForm.attr("action", '<lams:WebAppURL />learning/' + method + '.do?sessionMapID=${sessionMapID}&date=' + new Date().getTime());
+		        myForm.submit();
 			}
 			
 			return false;
Index: lams_tool_scratchie/web/pages/learning/parts/confidenceLevelPortrait.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/learning/parts/confidenceLevelPortrait.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/learning/parts/confidenceLevelPortrait.jsp	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -0,0 +1,25 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div class="c100 p${confidenceLevelDto.level}0 small" data-toggle="tooltip" data-placement="top" title="${confidenceLevelDto.userName}">
+	<span>
+		<c:choose>
+			<c:when test="${confidenceLevelDto.portraitUuid == null}">
+				<div class="portrait-generic-sm portrait-color-${confidenceLevelDto.userId % 7}"></div>
+			</c:when>
+			<c:otherwise>
+				<img class="portrait-sm portrait-round" src="${lams}download/?uuid=${confidenceLevelDto.portraitUuid}&preferDownload=false&version=4" alt="">
+			</c:otherwise>
+		</c:choose>
+	</span>
+									
+	<div class="slice">
+		<div class="bar"></div>
+		<div class="fill"></div>
+	</div>
+							
+	<div class="confidence-level-percentage">
+		<c:if test="${confidenceLevelDto.level != -1}">
+			${confidenceLevelDto.level}<c:if test="${confidenceLevelDto.level != 0}">0</c:if>%
+		</c:if>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
diff -u -r23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 23980a8cbd4e0d8d4e0b7ac4ad02e510d5653b75)
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -81,10 +81,22 @@
 			$('#finishButton').show();
 			return;
 		}
-		
+
+		// only updates come via websockets
 		$.each(input, function(itemUid, options) {
 			$.each(options, function(optionUid, isCorrect){
-				// only updates come via websockets
+				
+				var isVsaItem = !Number.isInteger(optionUid);
+				if (isVsaItem) {
+					var answer = optionUid;
+					optionUid = hashCode(optionUid);
+
+					//check if such image exists, create it otherwise
+					if ($('#image-' + itemUid + '-' + optionUid).length == 0) {
+						paintNewVsaAnswer(eval(itemUid), answer);
+					}
+				}
+				
 				scratchImage(itemUid, optionUid, isCorrect);
 			});
 		});
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r5085f565abf2755321060bb008683befc014dbb3 -re8a7110708b15579af2c6b31ac52a6da427fef6d
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 5085f565abf2755321060bb008683befc014dbb3)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
@@ -1,3 +1,5 @@
+<%@ include file="/common/taglibs.jsp"%>
+
 <c:forEach var="item" items="${sessionMap.itemList}">
 	<div class="lead">
         <a name="${item.qbQuestion.name}" style="text-decoration:none;color:black"><c:out value="${item.qbQuestion.name}" escapeXml="true" /></a>
@@ -6,83 +8,135 @@
 		<c:out value="${item.qbQuestion.description}" escapeXml="false" />
 	</div>
 
-	<table id="scratches" class="table table-hover">
-		<c:forEach var="optionDto" items="${item.optionDtos}" varStatus="status">
-			<tr id="tr${optionDto.qbOption.uid}">
-				<td style="width: 40px;">
-					<c:choose>
-						<c:when test="${optionDto.scratched && optionDto.qbOption.correct}">
-							<img src="<lams:WebAppURL/>includes/images/scratchie-correct.png" class="scartchie-image"
-								 id="image-${item.uid}-${optionDto.qbOption.uid}">
-						</c:when>
-						<c:when test="${optionDto.scratched && !optionDto.qbOption.correct}">
-							<img src="<lams:WebAppURL/>includes/images/scratchie-wrong.png" class="scartchie-image"
-								 id="image-${item.uid}-${optionDto.qbOption.uid}">
-						</c:when>
-						<c:when test="${sessionMap.userFinished || item.unraveled || !isUserLeader || (mode == 'teacher') || showResults}">
-							<img src="<lams:WebAppURL/>includes/images/answer-${status.index + 1}.png" class="scartchie-image"
-								 id="image-${item.uid}-${optionDto.qbOption.uid}">
-						</c:when>
-						<c:otherwise>
-							<a href="#nogo" onclick="scratchItem(${item.uid}, ${optionDto.qbOption.uid}); return false;"
-								id="imageLink-${item.uid}-${optionDto.qbOption.uid}"> <img
-								src="<lams:WebAppURL/>includes/images/answer-${status.index + 1}.png" class="scartchie-image"
-								id="image-${item.uid}-${optionDto.qbOption.uid}" />
-							</a>
-						</c:otherwise>
-					</c:choose> 
-					
-					<c:if test="${(showResults || mode == 'teacher') && (optionDto.attemptOrder != -1)}">
-						<div style="text-align: center; margin-top: 2px;">
-							<fmt:message key="label.choice.number">
-								<fmt:param>${optionDto.attemptOrder}</fmt:param>
-							</fmt:message>
+	<c:choose>
+	<c:when test="${item.qbQuestion.type == 1}">
+		<table class="table table-hover scratches">
+			<c:forEach var="optionDto" items="${item.optionDtos}" varStatus="status">
+				<tr id="tr${optionDto.qbOption.uid}">
+					<td style="width: 40px;">
+						<c:choose>
+							<c:when test="${optionDto.scratched && optionDto.qbOption.correct}">
+								<img src="<lams:WebAppURL/>includes/images/scratchie-correct.png" class="scartchie-image"
+									 id="image-${item.uid}-${optionDto.qbOption.uid}">
+							</c:when>
+							<c:when test="${optionDto.scratched && !optionDto.qbOption.correct}">
+								<img src="<lams:WebAppURL/>includes/images/scratchie-wrong.png" class="scartchie-image"
+									 id="image-${item.uid}-${optionDto.qbOption.uid}">
+							</c:when>
+							<c:when test="${sessionMap.userFinished || item.unraveled || !isUserLeader || (mode == 'teacher') || showResults}">
+								<img src="<lams:WebAppURL/>includes/images/answer-${status.index + 1}.png" class="scartchie-image"
+									 id="image-${item.uid}-${optionDto.qbOption.uid}">
+							</c:when>
+							<c:otherwise>
+								<a href="#nogo" onclick="scratchMcq(${item.uid}, ${optionDto.qbOption.uid}); return false;"
+									id="imageLink-${item.uid}-${optionDto.qbOption.uid}"> <img
+									src="<lams:WebAppURL/>includes/images/answer-${status.index + 1}.png" class="scartchie-image"
+									id="image-${item.uid}-${optionDto.qbOption.uid}" />
+								</a>
+							</c:otherwise>
+						</c:choose> 
+						
+						<c:if test="${(showResults || mode == 'teacher') && (optionDto.attemptOrder != -1)}">
+							<div style="text-align: center; margin-top: 2px;">
+								<fmt:message key="label.choice.number">
+									<fmt:param>${optionDto.attemptOrder}</fmt:param>
+								</fmt:message>
+							</div>
+						</c:if>
+					</td>
+	
+					<td
+						<c:if test="${fn:length(optionDto.confidenceLevelDtos) > 0}">class="answer-with-confidence-level-portrait"</c:if>
+					>
+						<div class="answer-description">
+							<c:out value="${optionDto.qbOption.name}" escapeXml="false" />
 						</div>
-					</c:if>
-				</td>
+						
+						<c:if test="${fn:length(optionDto.confidenceLevelDtos) > 0}">
+							<hr class="hr-confidence-level" />
+						
+							<div>
+								<c:forEach var="confidenceLevelDto" items="${optionDto.confidenceLevelDtos}" varStatus="status">
+									<%@ include file="parts/confidenceLevelPortrait.jsp"%>
+								</c:forEach>
+							</div>
+						</c:if>
+					</td>
+				</tr>
+			</c:forEach>
+		</table>
+	</c:when>
+	
+	<c:otherwise>
+		<table id="scratches-${item.uid}"  class="table table-hover scratches">
+			<c:forEach var="optionDto" items="${item.optionDtos}" varStatus="status">
+				<tr id="tr-${status.index}">
+				
+					<td style="width: 40px; border: none;">
+						<c:choose>
+							<c:when test="${optionDto.scratched && optionDto.correct}">
+								<img src="<lams:WebAppURL/>includes/images/scratchie-correct.png" class="scartchie-image"
+									 id="image-${item.uid}-${optionDto.answerHash}">
+							</c:when>
+							<c:when test="${optionDto.scratched && !optionDto.correct}">
+								<img src="<lams:WebAppURL/>includes/images/scratchie-wrong.png" class="scartchie-image"
+									 id="image-${item.uid}-${optionDto.answerHash}">
+							</c:when>
+							<c:otherwise>
+								<img src="<lams:WebAppURL/>includes/images/answer-${status.index + 1}.png" class="scartchie-image"
+									id="image-${item.uid}-${optionDto.answerHash}" 
+									<c:if test="${!sessionMap.userFinished && !item.unraveled && (mode != 'teacher') && !showResults}">style="visibility: hidden;"</c:if>
+									/>
+							</c:otherwise>
+						</c:choose>
+						
+						<c:if test="${(showResults || mode == 'teacher') && (optionDto.attemptOrder != -1)}">
+							<div style="text-align: center; margin-top: 2px;">
+								<fmt:message key="label.choice.number">
+									<fmt:param>${optionDto.attemptOrder}</fmt:param>
+								</fmt:message>
+							</div>
+						</c:if>
+					</td>
+	
+					<td class="answer-with-confidence-level-portrait">
+						<div class="answer-description">
+							<c:out value="${optionDto.answer}" escapeXml="false" />
+						</div>
+						
+						<c:if test="${fn:length(optionDto.confidenceLevelDtos) > 0}">
+							<hr class="hr-confidence-level" />
+							
+							<div>
+								<c:forEach var="confidenceLevelDto" items="${optionDto.confidenceLevelDtos}" varStatus="status">
+									<%@ include file="parts/confidenceLevelPortrait.jsp"%>
+								</c:forEach>
+							</div>
+						</c:if>
+					</td>
+				</tr>
+			</c:forEach>
+		</table>
 
-				<td
-					<c:if test="${fn:length(optionDto.confidenceLevelDtos) > 0}">class="answer-with-confidence-level-portrait"</c:if>
-				>
-					<div class="answer-description">
-						<c:out value="${optionDto.qbOption.name}" escapeXml="false" />
-					</div>
-					
-					<c:if test="${fn:length(optionDto.confidenceLevelDtos) > 0}">
-						<hr class="hr-confidence-level" />
-					
-						<div>
-							<c:forEach var="confidenceLevelDto" items="${optionDto.confidenceLevelDtos}" varStatus="status">
+		<c:if test="${!sessionMap.userFinished && !item.unraveled && isUserLeader && (mode != 'teacher') && !showResults}">
+			<div id="type-your-answer-${item.uid}" style="padding: 0 0 15px 100px; margin-top:-20px;">
+				<div>
+					<fmt:message key="label.type.your.group.answer" />
+				</div>
 							
-								<div class="c100 p${confidenceLevelDto.level}0 small" data-toggle="tooltip" data-placement="top" title="${confidenceLevelDto.userName}">
-									<span>
-										<c:choose>
-											<c:when test="${confidenceLevelDto.portraitUuid == null}">
-												<div class="portrait-generic-sm portrait-color-${confidenceLevelDto.userId % 7}"></div>
-											</c:when>
-											<c:otherwise>
-			    								<img class="portrait-sm portrait-round" src="${lams}download/?uuid=${confidenceLevelDto.portraitUuid}&preferDownload=false&version=4" alt="">
-											</c:otherwise>
-										</c:choose>
-									</span>
-									
-									<div class="slice">
-										<div class="bar"></div>
-										<div class="fill"></div>
-									</div>
-									
-									<div class="confidence-level-percentage">
-										${confidenceLevelDto.level}0%
-									</div>
-								</div>
-	    
-							</c:forEach>
-						</div>
-					</c:if>
-				</td>
-			</tr>
-		</c:forEach>
-	</table>
+				<div>
+					<input type="text" id="input-${item.uid}" size="70" class="form-control input-sm voffset5 submit-user-answer-input
+						<c:if test="${item.qbQuestion.autocompleteEnabled}">ui-autocomplete-input</c:if>"
+						style="display: inline-block; width: 70%;" data-item-uid="${item.uid}"/>
+							
+					<button class="btn btn-default btn-sm submit-user-answer" data-item-uid="${item.uid}" >
+						<fmt:message key="label.button.submit" />
+					</button>
+				</div>		
+			</div>
+		</c:if>
+	</c:otherwise>
+	</c:choose>
 	
 	<%-- show burning questions --%>
 	<c:if test="${!showResults && scratchie.burningQuestionsEnabled && (isUserLeader || (mode == 'teacher'))}">