Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r53dbc37b6825194501d9f178308323373eebc3fa -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 53dbc37b6825194501d9f178308323373eebc3fa)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -1120,3 +1120,7 @@
 label.qb.collection.remove.questions.tooltip = Remove all selected questions from the collection. If they are present only in this collection, they will be permanently removed. 
 label.qb.collection.remove.questions.fail = Questions can only be removed/deleted from the collection if they have not been used in an assessment activity.  If the question is already in used, it will not be deleted.
 label.authoring.short.answer.hint = In each option box type answers in separate lines.
+label.vsa.allocate.button = Allocate VSAs
+label.vsa.allocate.description = Allocate students' answers by dragging and dropping them to correct options
+label.vsa.deallocate.button.tip = Click to move answer back to queue
+label.vsa.deallocate.confirm = Are you sure you want to mark this answer as not correct? Students' scores will be recalculated.
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/VsaController.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/VsaController.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/VsaController.java	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -0,0 +1,81 @@
+package org.lamsfoundation.lams.web.qb;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.lamsfoundation.lams.qb.service.IQbService;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+@Controller
+@RequestMapping("/qb/vsa")
+public class VsaController {
+
+    @Autowired
+    private IQbService qbService;
+
+    @Autowired
+    private ILamsToolService toolService;
+
+    @RequestMapping("/displayVsaAllocate")
+    public String displayVsaAllocate(@RequestParam(name = AttributeNames.PARAM_TOOL_CONTENT_ID) long toolContentId,
+	    Model model) {
+
+	model.addAttribute("questions", toolService.getUnallocatedVSAnswers(toolContentId));
+	return "qb/vsa/vsaAllocate";
+    }
+
+    @RequestMapping(path = "/allocateUserAnswer", method = RequestMethod.POST)
+    @ResponseBody
+    public String allocateUserAnswer(HttpServletResponse response, @RequestParam Long toolQuestionUid,
+	    @RequestParam Long targetOptionUid, @RequestParam Long previousOptionUid, @RequestParam String answer) {
+
+	Long optionUid = null;
+	boolean answerFoundInResults = false;
+
+	if (!targetOptionUid.equals(previousOptionUid) && StringUtils.isNotBlank(answer)) {
+	    /*
+	     * We need to synchronise this operation.
+	     * When multiple requests are made to modify the same option, for example to add a VSA answer,
+	     * we have a case of dirty reads.
+	     * One answer gets added, but while DB is still flushing,
+	     * another answer reads the option without the first answer,
+	     * because it is not there yet.
+	     * The second answer gets added, but the first one gets lost.
+	     *
+	     * We can not synchronise the method in service
+	     * as the "dirty" transaction is already started before synchronisation kicks in.
+	     * We do it here, before transaction starts.
+	     * It will not work for distributed environment, though.
+	     * If teachers allocate answers on different LAMS servers,
+	     * we can still get the same problem. We will need a more sophisticated solution then.
+	     */
+
+	    synchronized (qbService) {
+		optionUid = qbService.allocateVSAnswerToOption(toolQuestionUid, targetOptionUid, previousOptionUid,
+			answer);
+	    }
+
+	    // recalculate marks for all lessons in all cases except for reshuffling inside the same container
+	    answerFoundInResults = toolService.recalculateMarksForVsaQuestion(toolQuestionUid, answer);
+	}
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put("isAnswerDuplicated", optionUid != null);
+	responseJSON.put("optionUid", optionUid == null ? -1 : optionUid);
+	responseJSON.put("answerFoundInResults", answerFoundInResults);
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+}
Index: lams_central/web/includes/javascript/vsaAllocate.js
===================================================================
diff -u -rd99e586940f6f2ca7a230ed6770dc51803d71e23 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_central/web/includes/javascript/vsaAllocate.js	(.../vsaAllocate.js)	(revision d99e586940f6f2ca7a230ed6770dc51803d71e23)
+++ lams_central/web/includes/javascript/vsaAllocate.js	(.../vsaAllocate.js)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -10,15 +10,15 @@
 		  	filter: '.filtered', // 'filtered' class is not draggable
 			onEnd: function (evt) {
 				let data = {
-		            	questionUid: questionUid,
+		            	toolQuestionUid: questionUid,
 		            	targetOptionUid: $(evt.to).data("option-uid"),
 		            	previousOptionUid: $(evt.from).data("option-uid"),
 		            	answer: $('.answer-text', evt.item).text()
 				    };
 				data[csrfTokenName] = csrfTokenValue;
 				
 		        $.ajax({
-		            url: WEB_APP_URL + 'monitoring/allocateUserAnswer.do',
+		            url: LAMS_URL + 'qb/vsa/allocateUserAnswer.do',
 		            data: data,
 		            method: 'post',
 		          	dataType: "json",
@@ -44,7 +44,7 @@
 			optionUid = container.data('option-uid'),
 			isCorrect = container.data('option-correct'),
 			data = {
-	            	questionUid: questionUid,
+	            	toolQuestionUid: questionUid,
 	            	targetOptionUid: -1,
 	            	previousOptionUid: optionUid,
 	            	answer: answer
@@ -57,7 +57,7 @@
 		data[csrfTokenName] = csrfTokenValue;
 				
         $.ajax({
-		    url: WEB_APP_URL + 'monitoring/allocateUserAnswer.do',
+		    url: LAMS_URL + 'qb/vsa/allocateUserAnswer.do',
             data: data,
             method: 'post',
           	dataType: "json",
Index: lams_central/web/qb/vsa/vsaAllocate.jsp
===================================================================
diff -u -rd99e586940f6f2ca7a230ed6770dc51803d71e23 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_central/web/qb/vsa/vsaAllocate.jsp	(.../vsaAllocate.jsp)	(revision d99e586940f6f2ca7a230ed6770dc51803d71e23)
+++ lams_central/web/qb/vsa/vsaAllocate.jsp	(.../vsaAllocate.jsp)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="lams"><lams:LAMSURL /></c:set>
 
 <lams:html>
 	<lams:head>
 	
-		<%@ include file="/common/header.jsp"%>
-		
 		<title><fmt:message key="label.vsa.allocate.button" /></title>
 		
-		<link href="<lams:WebAppURL />includes/css/vsaAllocate.css" rel="stylesheet" type="text/css">
+		<lams:css />
+		<link href="${lams}css/vsaAllocate.css" rel="stylesheet" type="text/css">
 		<style>
 			body {
 				padding: 10px;
@@ -20,12 +20,16 @@
 			}
 		</style>
 		
+		<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/bootstrap.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/Sortable.js"></script>
   	    <script>
 			var VS_ANSWER_ALLOCATED_ALERT = "<fmt:message key="label.someone.allocated.this.answer" />",
 				VS_ANSWER_DEALLOCATE_CONFIRM = "<fmt:message key="label.vsa.deallocate.confirm" />",
-				WEB_APP_URL = "<lams:WebAppURL />",
+				LAMS_URL = "${lams}",
 				csrfTokenName = "<csrf:tokenname/>",
 				csrfTokenValue = "<csrf:tokenvalue/>";
   	    
@@ -37,7 +41,7 @@
 	   			self.parent.tb_remove();
 	   		}
   		</script>
-  		<lams:JSImport src="includes/javascript/vsaAllocate.js" relative="true" />
+  		<lams:JSImport src="includes/javascript/vsaAllocate.js" />
 	</lams:head>
 	
 <body>
@@ -53,9 +57,10 @@
 	<h4 id="page-description"><fmt:message key="label.vsa.allocate.description" /></h4>
 
 	
-	<c:forEach var="questionSummary" items="${questionSummaries}">
-		<c:set var="questionDto" value="${questionSummary.questionDto}"/>
-		<%@ include file="parts/vsaQuestionAllocate.jsp"%>
+	<c:forEach var="questionDto" items="${questions}">
+		<c:set var="question" value="${questionDto.key}" />
+		<c:set var="notAllocatedAnswers" value="${questionDto.value}" />
+		<%@ include file="vsaQuestionAllocate.jsp"%>
 	</c:forEach>		
 	
 	<div id="footer">
Index: lams_central/web/qb/vsa/vsaQuestionAllocate.jsp
===================================================================
diff -u -rd99e586940f6f2ca7a230ed6770dc51803d71e23 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_central/web/qb/vsa/vsaQuestionAllocate.jsp	(.../vsaQuestionAllocate.jsp)	(revision d99e586940f6f2ca7a230ed6770dc51803d71e23)
+++ lams_central/web/qb/vsa/vsaQuestionAllocate.jsp	(.../vsaQuestionAllocate.jsp)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -1,51 +1,57 @@
 <% pageContext.setAttribute("newLineChar", "\r\n"); %>
+<%@ include file="/common/taglibs.jsp"%>
 
+
+<c:set var="qbQuestion" value="${question.qbQuestion}" />
+<c:set var="isTbl" value="${qbQuestion.isVsaAndCompatibleWithTbl()}" />
+<c:set var="optionsArray" value="${qbQuestion.qbOptions.toArray()}" />
+
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<div class="panel-title">
-			<c:out value="${questionDto.title}" escapeXml="true"/>
+			<c:out value="${qbQuestion.name}" escapeXml="true"/>
 		</div>
 	</div>
 		
 	<div class="panel-body">
 		<lams:errors/>
          
-        <c:if test="${not empty questionDto.question}">
+        <c:if test="${not empty qbQuestion.description}">
 	        <div class="question-description">
-	        	<c:out value="${questionDto.question}" escapeXml="false"/>
+	        	<c:out value="${qbQuestion.description}" escapeXml="false"/>
 			</div>
 		</c:if>
 		
         <!--allocate responses-->
 		<div class="row">
 			<div class="col-sm-4 text-center">
-				<c:set var="option0" value="${questionDto.optionDtos.toArray()[0]}"/>
+				<c:set var="option0" value="${optionsArray[0]}"/>
 				<h4>
 					<c:choose>
-						<c:when test="${questionSummary.tbl && option0.maxMark == 1}">
+						<c:when test="${isTbl && 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 test="${isTbl && 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>
 				
-				<div class="list-group col sortable-on ${questionSummary.tbl ? 'tbl-correct-list' : ''}" 
-					 data-question-uid="${questionDto.uid}"
+				<div class="list-group col sortable-on ${isTbl ? 'tbl-correct-list' : ''}" 
+					 data-question-uid="${question.uid}"
 					 data-option-uid="${option0.uid}" id="answer-group${option0.uid}"></div>
 				
 				<c:if test="${not empty option0.name}">
 					<fmt:message key="label.answer.alternatives" />:
 					<div class="answer-alternatives" id="answer-alternatives${option0.uid}"
-						 data-question-uid="${questionDto.uid}"
+						 data-question-uid="${question.uid}"
 						 data-option-uid="${option0.uid}"
 						 data-option-correct="${option0.maxMark > 0}">
 						<c:forEach var="answer" items="${fn:split(option0.name, newLineChar)}">
-							<button type="button" class="btn btn-xs ${questionSummary.tbl ? 'btn-success' : 'btn-primary'}"
+							<button type="button" class="btn btn-xs ${isTbl ? 'btn-success' : 'btn-primary'}"
 									title='<fmt:message key="label.vsa.deallocate.button.tip" />'>${answer}</button>
 						</c:forEach>
 					</div>
@@ -55,30 +61,30 @@
 			<div class="col-sm-4 text-center">
             	<h4>
             		<fmt:message key="label.answer.queue" />
-            		<span id="answer-queue-size${questionDto.uid}"></span>
+            		<span id="answer-queue-size${question.uid}"></span>
             	</h4>
            		
            		<div class="list-group col sortable-on answer-queue"
-           			 data-question-uid="${questionDto.uid}" 
+           			 data-question-uid="${question.uid}" 
            			 data-option-uid="-1"
-           			 id="answer-queue${questionDto.uid}">
-            		<c:forEach var="questionResult" items="${questionSummary.notAllocatedQuestionResults}">
+           			 id="answer-queue${question.uid}">
+            		<c:forEach var="answer" items="${notAllocatedAnswers}">
             			<div class="list-group-item">
-            				<lams:Portrait userId="${questionResult.assessmentResult.user.userId}"/>
-            				<span class="answer-text">${questionResult.answer}</span>
+            				<lams:Portrait userId="${answer.value}"/>
+            				<span class="answer-text">${answer.key}</span>
             			</div>
             		</c:forEach>
            		</div>		
 			</div>
 			
 			<div class="col-sm-4 text-center">
-				<c:set var="option1" value="${questionDto.optionDtos.toArray()[1]}"/>
+				<c:set var="option1" value="${optionsArray[1]}"/>
 				<h4>
 					<c:choose>
-						<c:when test="${questionSummary.tbl && option1.maxMark == 1}">
+						<c:when test="${isTbl && 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}">
+						<c:when test="${isTbl && option1.maxMark == 0}">
 							<i class="fa fa-times fa-lg text-danger"></i>	<fmt:message key="label.incorrect" />
 						</c:when>
 						<c:otherwise>
@@ -87,46 +93,46 @@
 					</c:choose>
 				</h4>
 				
-				<div class="list-group col sortable-on ${questionSummary.tbl ? 'tbl-incorrect-list' : ''}"
-					 data-question-uid="${questionDto.uid}"
+				<div class="list-group col sortable-on ${isTbl ? 'tbl-incorrect-list' : ''}"
+					 data-question-uid="${question.uid}"
 					 data-option-uid="${option1.uid}" id="answer-group${option1.uid}"></div>
 					 	
 				<c:if test="${not empty option1.name}">
 					<fmt:message key="label.answer.alternatives" />:
 					<div class="answer-alternatives" id="answer-alternatives${option0.uid}"
-						 data-question-uid="${questionDto.uid}"
+						 data-question-uid="${question.uid}"
 						 data-option-uid="${option1.uid}"
 						 data-option-correct="${option1.maxMark > 0}">
 						<c:forEach var="answer" items="${fn:split(option1.name, newLineChar)}">
-							<button type="button" class="btn btn-xs ${questionSummary.tbl ? 'btn-danger' : 'btn-primary'}"
+							<button type="button" class="btn btn-xs ${isTbl ? 'btn-danger' : 'btn-primary'}"
 									title='<fmt:message key="label.vsa.deallocate.button.tip" />'>${answer}</button>
 						</c:forEach>
 					</div>
 				</c:if>
 			</div>
 		</div>
 		
-		<c:forEach var="optionDto" items="${questionDto.optionDtos}" begin="2" varStatus="status">
+		<c:forEach var="option" items="${optionsArray}" begin="2" varStatus="status">
 		
 			<c:if test="${status.count % 3 == 1}">
 				<div class="row">
 			</c:if>
 		
 			<div class="col-sm-4 text-center">
 				<h4>
-					<fmt:message key="label.authoring.basic.option.grade"/>: ${optionDto.maxMark}
+					<fmt:message key="label.authoring.basic.option.grade"/>: ${option.maxMark}
 				</h4>
 				
-				<div class="list-group col sortable-on" data-question-uid="${questionDto.uid}"
-					 data-option-uid="${optionDto.uid}" id="answer-group${optionDto.uid}"></div>
+				<div class="list-group col sortable-on" data-question-uid="${question.uid}"
+					 data-option-uid="${option.uid}" id="answer-group${option.uid}"></div>
 					 	
-				<c:if test="${not empty optionDto.name}">
+				<c:if test="${not empty option.name}">
 					<fmt:message key="label.answer.alternatives" />:
-					<div class="answer-alternatives" id="answer-alternatives${optionDto.uid}"
-						 data-question-uid="${questionDto.uid}"
-						 data-option-uid="${optionDto.uid}"
-						 data-option-correct="${optionDto.maxMark > 0}">
-						<c:forEach var="answer" items="${fn:split(optionDto.name, newLineChar)}">
+					<div class="answer-alternatives" id="answer-alternatives${option.uid}"
+						 data-question-uid="${question.uid}"
+						 data-option-uid="${option.uid}"
+						 data-option-correct="${option.maxMark > 0}">
+						<c:forEach var="answer" items="${fn:split(option.name, newLineChar)}">
 							<button type="button" class="btn btn-xs btn-primary"
 									title='<fmt:message key="label.vsa.deallocate.button.tip" />'>${answer}</button>
 						</c:forEach>
Index: lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
===================================================================
diff -u -red9036e9c8bfe42b4efb380640888938d265ca1d -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java	(.../QbUtils.java)	(revision ed9036e9c8bfe42b4efb380640888938d265ca1d)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java	(.../QbUtils.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -1,8 +1,12 @@
 package org.lamsfoundation.lams.qb;
 
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
+import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.servlet.http.HttpSession;
 
@@ -18,6 +22,10 @@
 
 public class QbUtils {
 
+    public static final String VSA_ANSWER_NORMALISE_JAVA_REG_EXP = "\\W";
+    public static final String VSA_ANSWER_NORMALISE_SQL_REG_EXP = "[^[:alpha:][:alnum:]_]";
+    public static final String VSA_ANSWER_DELIMITER = "\r\n";
+
     public static final Function<String, String> QB_MIGRATION_CKEDITOR_CLEANER = string -> string == null ? null
 	    : string.replaceAll(">\\&nbsp;", ">").replaceAll("\\r|\\n", "").trim();
 
@@ -80,6 +88,25 @@
 	form.setOldCollectionUid(collectionUid);
     }
 
+    public static String normaliseVSAnswer(String answer) {
+	return StringUtils.isBlank(answer) ? null : answer.replaceAll(VSA_ANSWER_NORMALISE_JAVA_REG_EXP, "");
+    }
+
+    public static Set<String> normaliseVSOption(String option) {
+	return StringUtils.isBlank(option) ? Set.of()
+		: Stream.of(option.split(VSA_ANSWER_DELIMITER)).filter(StringUtils::isNotBlank)
+			.collect(Collectors.mapping(answer -> QbUtils.normaliseVSAnswer(answer),
+				Collectors.toCollection(LinkedHashSet::new)));
+    }
+
+    public static boolean isVSAnswerAllocated(String option, String answer, boolean isCaseSensitive) {
+	if (StringUtils.isBlank(option) || StringUtils.isBlank(answer)) {
+	    return false;
+	}
+	return QbUtils.normaliseVSOption(option).stream()
+		.anyMatch(s -> isCaseSensitive ? s.equals(answer) : s.equalsIgnoreCase(answer));
+    }
+
     private static Integer getUserId() {
 	HttpSession ss = SessionManager.getSession();
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
===================================================================
diff -u -rd4ca48e53c792f5021279765d8263ebdbd516339 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(.../IQbService.java)	(revision d4ca48e53c792f5021279765d8263ebdbd516339)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(.../IQbService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -167,4 +167,6 @@
     TreeSet<QbOption> getOptionsFromRequest(HttpServletRequest request, boolean isForSaving);
 
     TreeSet<QbQuestionUnit> getUnitsFromRequest(HttpServletRequest request, boolean isForSaving);
+
+    Long allocateVSAnswerToOption(Long qbQuestionUid, Long targetOptionUid, Long previousOptionUid, String answer);
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
===================================================================
diff -u -r970744e51617c0614313597e042767b43f5a7326 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(.../QbService.java)	(revision 970744e51617c0614313597e042767b43f5a7326)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(.../QbService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -12,6 +12,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +38,7 @@
 import org.lamsfoundation.lams.logevent.LogEvent;
 import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.qb.QbConstants;
+import org.lamsfoundation.lams.qb.QbUtils;
 import org.lamsfoundation.lams.qb.dao.IQbDAO;
 import org.lamsfoundation.lams.qb.dto.QbStatsActivityDTO;
 import org.lamsfoundation.lams.qb.dto.QbStatsDTO;
@@ -784,6 +786,101 @@
     }
 
     /**
+     * Allocate learner's answer into one of the available answer groups.
+     *
+     * @param qbQuestionUid
+     * @param targetOptionUid
+     * @param previousOptionUid
+     * @param answer
+     * @return if present, it contains optionUid of the option group containing duplicate (added there presumably by
+     *         another teacher working in parallel)
+     */
+    @Override
+    public Long allocateVSAnswerToOption(Long toolQuestionUid, Long targetOptionUid, Long previousOptionUid,
+	    String answer) {
+	String normalisedAnswer = QbUtils.normaliseVSAnswer(answer);
+	if (normalisedAnswer == null) {
+	    return null;
+	}
+	answer = answer.strip();
+
+	QbToolQuestion toolQuestion = qbDAO.find(QbToolQuestion.class, toolQuestionUid);
+	QbQuestion qbQuestion = toolQuestion.getQbQuestion();
+	Long qbQuestionUid = qbQuestion.getUid();
+	boolean isQuestionCaseSensitive = qbQuestion.isCaseSensitive();
+
+	QbOption previousOption = null;
+	QbOption targetOption = null;
+
+	// look for source and target options
+	for (QbOption option : qbQuestion.getQbOptions()) {
+	    if (previousOptionUid.equals(-1L)) {
+		// new allocation, check if the answer was not allocated anywhere already
+		String name = option.getName();
+		boolean isAnswerAllocated = QbUtils.isVSAnswerAllocated(name, normalisedAnswer,
+			isQuestionCaseSensitive);
+		if (isAnswerAllocated) {
+		    return option.getUid();
+		}
+	    } else if (previousOption == null && option.getUid().equals(previousOptionUid)) {
+		previousOption = option;
+	    }
+	    if (targetOption == null && !targetOptionUid.equals(-1L) && option.getUid().equals(targetOptionUid)) {
+		targetOption = option;
+	    }
+	}
+
+	if (!targetOptionUid.equals(-1L) && targetOption == null) {
+	    // front end provided incorrect target option UID
+	    log.error("Target option with UID " + targetOptionUid + " was not found in question with UID "
+		    + qbQuestionUid + " to allocate answer " + answer);
+	    return null;
+	}
+
+	// remove from already allocated option
+	if (previousOption != null) {
+	    String name = previousOption.getName();
+	    String[] alternatives = name.split(QbUtils.VSA_ANSWER_DELIMITER);
+
+	    Set<String> nameWithoutUserAnswer = new LinkedHashSet<>(List.of(alternatives));
+	    nameWithoutUserAnswer.remove(answer);
+	    name = nameWithoutUserAnswer.isEmpty() ? ""
+		    : nameWithoutUserAnswer.stream().collect(Collectors.joining(QbUtils.VSA_ANSWER_DELIMITER));
+	    previousOption.setName(name);
+	    qbDAO.update(previousOption);
+	    qbDAO.flush();
+
+	    if (log.isInfoEnabled()) {
+		log.info("Removed VS answer \"" + answer + "\" from option " + previousOptionUid + " in question "
+			+ qbQuestionUid);
+	    }
+	}
+
+	if (targetOption != null) {
+	    String name = targetOption.getName();
+
+	    boolean isAnswerAllocated = QbUtils.isVSAnswerAllocated(name, normalisedAnswer, isQuestionCaseSensitive);
+	    if (isAnswerAllocated) {
+		// the answer has been already allocated to the target option
+		return targetOptionUid;
+	    }
+
+	    // append new answer to option
+	    name += (StringUtils.isBlank(name) ? "" : QbUtils.VSA_ANSWER_DELIMITER) + answer;
+	    targetOption.setName(name);
+	    qbDAO.update(targetOption);
+	    qbDAO.flush();
+
+	    if (log.isInfoEnabled()) {
+		log.info("Allocated VS  answer \"" + answer + "\" to option " + targetOptionUid + " in question "
+			+ qbQuestionUid);
+	    }
+	}
+
+	return null;
+    }
+
+    /**
      * Extract web form content to QB question.
      *
      * BE CAREFUL: This method will copy necessary info from request form to an old or new AssessmentQuestion
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java
===================================================================
diff -u -r70eb09e59b67dfc68c2cc425cd43e521c0d7fab8 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java	(.../ICommonAssessmentService.java)	(revision 70eb09e59b67dfc68c2cc425cd43e521c0d7fab8)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java	(.../ICommonAssessmentService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -4,6 +4,7 @@
 import java.util.Map;
 
 import org.lamsfoundation.lams.confidencelevel.VsaAnswerDTO;
+import org.lamsfoundation.lams.qb.model.QbToolQuestion;
 
 public interface ICommonAssessmentService {
 
@@ -12,9 +13,19 @@
      * levels, if such option is turned on in Assessment). Currently only Assessment tool is capable of producing VSA
      * answers.
      */
-    Collection<VsaAnswerDTO> getVsaAnswers(Long toolSessionId);
+    Collection<VsaAnswerDTO> getVSAnswers(Long toolSessionId);
 
     /**
+     * Returns VS answers which require allocation for the given activity
+     */
+    Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswersForActivity(long toolContentId);
+
+    /**
+     * Returns VS answers which require allocation for the given tool question ID
+     */
+    Map<String, Integer> getUnallocatedVSAnswersForQuestion(long toolQuestionUid);
+
+    /**
      * Counts how many questions were answered correctly by the given user, regardless of the mark given.
      * Currently it only works for MCQ and mark hedging questions.
      */
@@ -28,4 +39,6 @@
      * @return map user ID -> correct answer count
      */
     Map<Integer, Integer> countCorrectAnswers(long toolContentId);
+
+    boolean recalculateMarksForVsaQuestion(Long questionUid, String answer);
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java
===================================================================
diff -u -r64bfad846c475db43b1b303e0df03735f39d34ce -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java	(.../ICommonScratchieService.java)	(revision 64bfad846c475db43b1b303e0df03735f39d34ce)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java	(.../ICommonScratchieService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -1,7 +1,7 @@
 package org.lamsfoundation.lams.tool.service;
 
 public interface ICommonScratchieService {
-    void recalculateScratchieMarksForVsaQuestion(Long qbQuestionUid, String answer);
+    boolean recalculateMarksForVsaQuestion(Long qbQuestionUid, String answer);
 
     /**
      * Counts how many questions were answered correctly on first attempt by the given user, regardless of mark given.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
===================================================================
diff -u -rec9b0ffc2e88f3504fd7505ee8474f86d89a2458 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision ec9b0ffc2e88f3504fd7505ee8474f86d89a2458)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -25,13 +25,15 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 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.Group;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.qb.model.QbToolQuestion;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolSession;
@@ -231,11 +233,18 @@
 	    Integer requestorUserId, Long requestorToolSessionId);
 
     /**
-     * Recalculate marks for all Scratchie activities that use specified QbQuestion with given answer.
+     * Returns VS answers which require allocation
      */
-    void recalculateScratchieMarksForVsaQuestion(Long qbQuestionUid, String answer);
+    Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswers(long toolContentId);
 
     /**
+     * Recalculate marks for all activities that use specified QbQuestion with given answer
+     *
+     * @return whether there is a learner who used the given answer
+     */
+    boolean recalculateMarksForVsaQuestion(Long qbQuestionUid, String answer);
+
+    /**
      * Get a count of all the users that would be returned by getUsersForActivity(Long toolSessionId);
      */
     Integer getCountUsersForActivity(Long toolSessionId);
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
diff -u -r96033f32ff880d045b4c087f52628d233dc98095 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 96033f32ff880d045b4c087f52628d233dc98095)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -560,7 +560,7 @@
 
 	try {
 	    ICommonAssessmentService sessionManager = (ICommonAssessmentService) findToolService(tool);
-	    return sessionManager.getVsaAnswers(toolSession.getToolSessionId());
+	    return sessionManager.getVSAnswers(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();
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r96033f32ff880d045b4c087f52628d233dc98095 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 96033f32ff880d045b4c087f52628d233dc98095)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -55,6 +55,7 @@
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.logevent.service.ILogEventService;
+import org.lamsfoundation.lams.qb.model.QbToolQuestion;
 import org.lamsfoundation.lams.tool.GroupedToolSession;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolOutput;
@@ -531,11 +532,36 @@
     }
 
     @Override
-    public void recalculateScratchieMarksForVsaQuestion(Long qbQuestionUid, String answer) {
+    public Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswers(long toolContentId) {
+	ToolActivity specifiedActivity = activityDAO.getToolActivityByToolContentId(toolContentId);
+	Tool tool = specifiedActivity.getTool();
+	if (tool.getToolSignature().equals(CommonConstants.TOOL_SIGNATURE_ASSESSMENT)) {
+	    ICommonAssessmentService sessionManager = (ICommonAssessmentService) lamsCoreToolService
+		    .findToolService(tool);
+	    return sessionManager.getUnallocatedVSAnswersForActivity(toolContentId);
+	}
+	return null;
+    }
+
+    @Override
+    public boolean recalculateMarksForVsaQuestion(Long toolQuestionUid, String answer) {
+	boolean answerFoundInLearnerResults = recalculateAssessmentMarksForVsaQuestion(toolQuestionUid, answer);
+	answerFoundInLearnerResults |= recalculateScratchieMarksForVsaQuestion(toolQuestionUid, answer);
+	return answerFoundInLearnerResults;
+    }
+
+    private boolean recalculateAssessmentMarksForVsaQuestion(Long tooQuestionUid, String answer) {
+	Tool assessmentTool = toolDAO.getToolBySignature(CommonConstants.TOOL_SIGNATURE_ASSESSMENT);
+	ICommonAssessmentService sessionManager = (ICommonAssessmentService) lamsCoreToolService
+		.findToolService(assessmentTool);
+	return sessionManager.recalculateMarksForVsaQuestion(tooQuestionUid, answer);
+    }
+
+    private boolean recalculateScratchieMarksForVsaQuestion(Long toolQuestionUid, String answer) {
 	Tool scratchieTool = toolDAO.getToolBySignature(CommonConstants.TOOL_SIGNATURE_SCRATCHIE);
 	ICommonScratchieService sessionManager = (ICommonScratchieService) lamsCoreToolService
 		.findToolService(scratchieTool);
-	sessionManager.recalculateScratchieMarksForVsaQuestion(qbQuestionUid, answer);
+	return sessionManager.recalculateMarksForVsaQuestion(toolQuestionUid, answer);
     }
 
     @Override
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8dac82ff3870ff39cd41d273bf22f290b66994c5 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8dac82ff3870ff39cd41d273bf22f290b66994c5)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -443,7 +443,4 @@
 label.authoring.advance.discussion.tooltip = When enabled, in TBL monitoring, teachers are able to start instant polls for each question to assess the students' understanding.
 label.learning.draft.autosave.error = It seems that you have lost connection to the server. Check your internet connection and click OK. If this keeps happening, please inform your teacher.
 message.disclose.correct.before.groups.answers = Usually other groups' answers are disclosed before correct answers so students can discuss their choices. Are you sure you want continue?
-label.vsa.allocate.button = Allocate VSAs
-label.vsa.allocate.description = Allocate students' answers by dragging and dropping them to correct options
-label.vsa.deallocate.button.tip = Click to move answer back to queue
-label.vsa.deallocate.confirm = Are you sure you want to mark this answer as not correct? Students' scores will be recalculated.
\ No newline at end of file
+label.vsa.allocate.button = Allocate VSAs
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
===================================================================
diff -u -rbb6788de1fe910e6ab6fb14bb54b5e21551392de -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision bb6788de1fe910e6ab6fb14bb54b5e21551392de)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -31,13 +31,13 @@
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.Query;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.lamsfoundation.lams.qb.QbUtils;
 import org.lamsfoundation.lams.tool.assessment.dao.AssessmentResultDAO;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
 import org.lamsfoundation.lams.tool.assessment.model.Assessment;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionResult;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
-import org.lamsfoundation.lams.tool.assessment.util.AssessmentEscapeUtils;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.springframework.stereotype.Repository;
 
@@ -152,15 +152,15 @@
 		+ " WHERE q.assessmentResult.uid = r.uid AND q.qbToolQuestion.qbQuestion.uid =:qbQuestionUid ";
 	if (StringUtils.isNotBlank(answer)) {
 
-	    FIND_BY_QBQUESTION += "AND REGEXP_REPLACE(q.answer, '"
-		    + AssessmentEscapeUtils.VSA_ANSWER_NORMALISE_SQL_REG_EXP + "', '') = :answer";
+	    FIND_BY_QBQUESTION += "AND REGEXP_REPLACE(q.answer, '" + QbUtils.VSA_ANSWER_NORMALISE_SQL_REG_EXP
+		    + "', '') = :answer";
 	}
 	FIND_BY_QBQUESTION += " ORDER BY r.startDate ASC";
 
 	Query<AssessmentResult> q = getSession().createQuery(FIND_BY_QBQUESTION, AssessmentResult.class);
 	q.setParameter("qbQuestionUid", qbQuestionUid);
 	if (StringUtils.isNotBlank(answer)) {
-	    String normalisedAnswer = AssessmentEscapeUtils.normaliseVSAnswer(answer);
+	    String normalisedAnswer = QbUtils.normaliseVSAnswer(answer);
 	    q.setParameter("answer", normalisedAnswer);
 	}
 	return q.list();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rbb6788de1fe910e6ab6fb14bb54b5e21551392de -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision bb6788de1fe910e6ab6fb14bb54b5e21551392de)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -34,7 +34,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -76,6 +75,7 @@
 import org.lamsfoundation.lams.outcome.Outcome;
 import org.lamsfoundation.lams.outcome.OutcomeMapping;
 import org.lamsfoundation.lams.outcome.service.IOutcomeService;
+import org.lamsfoundation.lams.qb.QbUtils;
 import org.lamsfoundation.lams.qb.model.QbCollection;
 import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
@@ -842,13 +842,13 @@
 
 	    if (questionDto.getAnswer() != null) {
 		boolean isQuestionCaseSensitive = questionDto.isCaseSensitive();
-		String normalisedQuestionAnswer = AssessmentEscapeUtils.normaliseVSAnswer(questionDto.getAnswer());
+		String normalisedQuestionAnswer = QbUtils.normaliseVSAnswer(questionDto.getAnswer());
 
 		for (OptionDTO optionDto : questionDto.getOptionDtos()) {
 		    // refresh latest answers from DB
 		    QbOption qbOption = qbService.getOptionByUid(optionDto.getUid());
 		    optionDto.setName(qbOption.getName());
-		    boolean isAnswerAllocated = AssessmentEscapeUtils.isVSAnswerAllocated(qbOption.getName(),
+		    boolean isAnswerAllocated = QbUtils.isVSAnswerAllocated(qbOption.getName(),
 			    normalisedQuestionAnswer, isQuestionCaseSensitive);
 
 		    if (isAnswerAllocated) {
@@ -1402,6 +1402,36 @@
     }
 
     @Override
+    public Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswersForActivity(long toolContentId) {
+	Map<QbToolQuestion, Map<String, Integer>> result = new LinkedHashMap<>();
+
+	Assessment assessment = getAssessmentByContentId(toolContentId);
+	for (AssessmentQuestion question : assessment.getQuestions()) {
+	    if (question.getType().equals(QbQuestion.TYPE_VERY_SHORT_ANSWERS)) {
+		Map<String, Integer> unallocatedQuestionAnswers = getUnallocatedVSAnswersForQuestion(toolContentId,
+			question.getUid());
+		result.put(question, unallocatedQuestionAnswers);
+	    }
+	}
+	return result;
+    }
+
+    @Override
+    public Map<String, Integer> getUnallocatedVSAnswersForQuestion(long toolQuestionUid) {
+	AssessmentQuestion question = getAssessmentQuestionByUid(toolQuestionUid);
+	return getUnallocatedVSAnswersForQuestion(question.getToolContentId(), toolQuestionUid);
+    }
+
+    private Map<String, Integer> getUnallocatedVSAnswersForQuestion(long toolContentId, long toolQuestionUid) {
+	// gets mapping answer -> user ID for all answers which were not allocation into VSA option yet
+	QuestionSummary questionSummary = getQuestionSummary(toolContentId, toolQuestionUid);
+	return questionSummary.getNotAllocatedQuestionResults().stream()
+		.collect(Collectors.toMap(AssessmentQuestionResult::getAnswer,
+			r -> r.getAssessmentResult().getUser().getUserId().intValue(), (user1, user2) -> user1,
+			LinkedHashMap::new));
+    }
+
+    @Override
     public QuestionSummary getQuestionSummary(Long contentId, Long questionUid) {
 	AssessmentQuestion question = assessmentQuestionDao.getByUid(questionUid);
 	QbQuestion qbQuestion = question.getQbQuestion();
@@ -1423,13 +1453,12 @@
 		    continue;
 		}
 
-		String normalisedAnswer = AssessmentEscapeUtils.normaliseVSAnswer(answer);
+		String normalisedAnswer = QbUtils.normaliseVSAnswer(answer);
 
 		boolean isAnswerAllocated = false;
 		for (QbOption option : qbQuestion.getQbOptions()) {
 		    String name = option.getName();
-		    isAnswerAllocated = AssessmentEscapeUtils.isVSAnswerAllocated(name, normalisedAnswer,
-			    isQuestionCaseSensitive);
+		    isAnswerAllocated = QbUtils.isVSAnswerAllocated(name, normalisedAnswer, isQuestionCaseSensitive);
 		    if (isAnswerAllocated) {
 			break;
 		    }
@@ -1457,102 +1486,17 @@
     }
 
     @Override
-    public Long allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid, String answer) {
-	String normalisedAnswer = AssessmentEscapeUtils.normaliseVSAnswer(answer);
-	if (normalisedAnswer == null) {
-	    return null;
-	}
-	answer = answer.strip();
-
-	AssessmentQuestion assessmentQuestion = assessmentQuestionDao.getByUid(questionUid);
+    public boolean recalculateMarksForVsaQuestion(Long toolQuestionUid, String answer) {
+	AssessmentQuestion assessmentQuestion = assessmentQuestionDao.getByUid(toolQuestionUid);
 	QbQuestion qbQuestion = assessmentQuestion.getQbQuestion();
-	boolean isQuestionCaseSensitive = qbQuestion.isCaseSensitive();
-
-	QbOption previousOption = null;
-	QbOption targetOption = null;
-
-	// look for source and target options
-	for (QbOption option : qbQuestion.getQbOptions()) {
-	    if (previousOptionUid.equals(-1L)) {
-		// new allocation, check if the answer was not allocated anywhere already
-		String name = option.getName();
-		boolean isAnswerAllocated = AssessmentEscapeUtils.isVSAnswerAllocated(name, normalisedAnswer,
-			isQuestionCaseSensitive);
-		if (isAnswerAllocated) {
-		    return option.getUid();
-		}
-	    } else if (previousOption == null && option.getUid().equals(previousOptionUid)) {
-		previousOption = option;
-	    }
-	    if (targetOption == null && !targetOptionUid.equals(-1L) && option.getUid().equals(targetOptionUid)) {
-		targetOption = option;
-	    }
-	}
-
-	if (!targetOptionUid.equals(-1L) && targetOption == null) {
-	    // front end provided incorrect target option UID
-	    log.error("Target option with UID " + targetOptionUid + " was not found in question with UID " + questionUid
-		    + " to allocate answer " + answer);
-	    return null;
-	}
-
-	// remove from already allocated option
-	if (previousOption != null) {
-	    String name = previousOption.getName();
-	    String[] alternatives = name.split(AssessmentEscapeUtils.VSA_ANSWER_DELIMITER);
-
-	    Set<String> nameWithoutUserAnswer = new LinkedHashSet<>(List.of(alternatives));
-	    nameWithoutUserAnswer.remove(answer);
-	    name = nameWithoutUserAnswer.isEmpty() ? ""
-		    : nameWithoutUserAnswer.stream()
-			    .collect(Collectors.joining(AssessmentEscapeUtils.VSA_ANSWER_DELIMITER));
-	    previousOption.setName(name);
-	    assessmentDao.saveObject(previousOption);
-	    assessmentDao.flush();
-
-	    if (log.isInfoEnabled()) {
-		log.info("Removed VS answer \"" + answer + "\" from option " + previousOptionUid + " in question "
-			+ questionUid);
-	    }
-	}
-
-	if (targetOption != null) {
-	    String name = targetOption.getName();
-
-	    boolean isAnswerAllocated = AssessmentEscapeUtils.isVSAnswerAllocated(name, normalisedAnswer,
-		    isQuestionCaseSensitive);
-	    if (isAnswerAllocated) {
-		// the answer has been already allocated to the target option
-		return targetOptionUid;
-	    }
-
-	    // append new answer to option
-	    name += (StringUtils.isBlank(name) ? "" : AssessmentEscapeUtils.VSA_ANSWER_DELIMITER) + answer;
-	    targetOption.setName(name);
-	    assessmentDao.saveObject(targetOption);
-	    assessmentDao.flush();
-
-	    if (log.isInfoEnabled()) {
-		log.info("Allocated VS  answer \"" + answer + "\" to option " + targetOptionUid + " in question "
-			+ questionUid);
-	    }
-	}
-
-	return null;
-    }
-
-    @Override
-    public boolean recalculateMarksForAllocatedAnswer(Long questionUid, String answer) {
-	AssessmentQuestion assessmentQuestion = assessmentQuestionDao.getByUid(questionUid);
-	QbQuestion qbQuestion = assessmentQuestion.getQbQuestion();
 	// get all finished user results
 	List<AssessmentResult> assessmentResults = assessmentResultDao
 		.getAssessmentResultsByQbQuestionAndAnswer(qbQuestion.getUid(), answer);
 	//stores userId->lastFinishedAssessmentResult
-	Map<Long, AssessmentResult> lastFinishedAssessmentResults = new LinkedHashMap<>();
+	Map<Long, AssessmentResult> assessmentResultsMap = new LinkedHashMap<>();
 	for (AssessmentResult assessmentResult : assessmentResults) {
 	    Long userId = assessmentResult.getUser().getUserId();
-	    lastFinishedAssessmentResults.put(userId, assessmentResult);
+	    assessmentResultsMap.put(userId, assessmentResult);
 	}
 
 	for (AssessmentResult assessmentResult : assessmentResults) {
@@ -1581,14 +1525,11 @@
 	    }
 
 	    // store new mark and maxMark if they were changed
-	    AssessmentResult lastFinishedAssessmentResult = lastFinishedAssessmentResults.get(user.getUserId());
+	    AssessmentResult lastFinishedAssessmentResult = assessmentResultsMap.get(user.getUserId());
 	    storeAssessmentResultMarkAndMaxMark(assessmentResult, lastFinishedAssessmentResult, assessmentMark,
 		    assessmentMaxMark, user);
 	}
 
-	//recalculate marks in all Scratchie activities, that use modified QbQuestion
-	toolService.recalculateScratchieMarksForVsaQuestion(qbQuestion.getUid(), answer);
-
 	return !assessmentResults.isEmpty();
     }
 
@@ -3307,7 +3248,7 @@
     }
 
     @Override
-    public Collection<VsaAnswerDTO> getVsaAnswers(Long toolSessionId) {
+    public Collection<VsaAnswerDTO> getVSAnswers(Long toolSessionId) {
 	if (toolSessionId == null) {
 	    return new ArrayList<>();
 	}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -rbb6788de1fe910e6ab6fb14bb54b5e21551392de -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision bb6788de1fe910e6ab6fb14bb54b5e21551392de)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -413,24 +413,6 @@
     QuestionSummary getQuestionSummary(Long contentId, Long questionUid);
 
     /**
-     * Allocate learner's answer into one of the available answer groups.
-     *
-     * @param questionUid
-     * @param targetOptionUid
-     * @param previousOptionUid
-     * @param questionResultUid
-     * @return if present, it contains optionUid of the option group containing duplicate (added there presumably by
-     *         another teacher working in parallel)
-     */
-    Long allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid, String answer);
-
-    /**
-     * Recalculate learners' marks after a VSA answer was allocated as correct or incorrect.
-     * Returns true if at least one result was recalculated.
-     */
-    boolean recalculateMarksForAllocatedAnswer(Long questionUid, String answer);
-
-    /**
      * For export purposes
      *
      * @param contentId
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
===================================================================
diff -u -rbb6788de1fe910e6ab6fb14bb54b5e21551392de -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java	(.../AssessmentEscapeUtils.java)	(revision bb6788de1fe910e6ab6fb14bb54b5e21551392de)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java	(.../AssessmentEscapeUtils.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -22,11 +22,8 @@
 
 package org.lamsfoundation.lams.tool.assessment.util;
 
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
@@ -43,10 +40,6 @@
 
 public class AssessmentEscapeUtils {
 
-    public static final String VSA_ANSWER_NORMALISE_JAVA_REG_EXP = "\\W";
-    public static final String VSA_ANSWER_NORMALISE_SQL_REG_EXP = "[^[:alpha:][:alnum:]_]";
-    public static final String VSA_ANSWER_DELIMITER = "\r\n";
-
     public static class AssessmentExcelCell {
 	public Object value;
 	public boolean isHighlighted;
@@ -369,23 +362,4 @@
 
 	return new AssessmentExcelCell(StringUtils.isBlank(ret) ? null : ret, highlightCell);
     }
-
-    public static String normaliseVSAnswer(String answer) {
-	return StringUtils.isBlank(answer) ? null : answer.replaceAll(VSA_ANSWER_NORMALISE_JAVA_REG_EXP, "");
-    }
-
-    public static Set<String> normaliseVSOption(String option) {
-	return StringUtils.isBlank(option) ? Set.of()
-		: Stream.of(option.split(VSA_ANSWER_DELIMITER)).filter(StringUtils::isNotBlank)
-			.collect(Collectors.mapping(answer -> AssessmentEscapeUtils.normaliseVSAnswer(answer),
-				Collectors.toCollection(LinkedHashSet::new)));
-    }
-
-    public static boolean isVSAnswerAllocated(String option, String answer, boolean isCaseSensitive) {
-	if (StringUtils.isBlank(option) || StringUtils.isBlank(answer)) {
-	    return false;
-	}
-	return AssessmentEscapeUtils.normaliseVSOption(option).stream()
-		.anyMatch(s -> isCaseSensitive ? s.equals(answer) : s.equalsIgnoreCase(answer));
-    }
 }
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -rea355e79020de11b00f2acf713ed79ec603d7679 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision ea355e79020de11b00f2acf713ed79ec603d7679)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -310,64 +310,6 @@
 	return "pages/monitoring/parts/questionsummary";
     }
 
-    @RequestMapping("/displayVsaAllocate")
-    public String displayVsaAllocate(HttpServletRequest request, HttpServletResponse response) {
-	Long contentId = WebUtil.readLongParam(request, AssessmentConstants.ATTR_TOOL_CONTENT_ID);
-	Assessment assessment = service.getAssessmentByContentId(contentId);
-
-	List<QuestionSummary> questionSummaries = new ArrayList<>();
-	for (AssessmentQuestion question : assessment.getQuestions()) {
-	    if (question.getType().equals(QbQuestion.TYPE_VERY_SHORT_ANSWERS)) {
-		QuestionSummary questionSummary = service.getQuestionSummary(contentId, question.getUid());
-		questionSummaries.add(questionSummary);
-	    }
-	}
-	request.setAttribute("questionSummaries", questionSummaries);
-
-	return "pages/monitoring/vsaAllocate";
-    }
-
-    @RequestMapping(path = "/allocateUserAnswer", method = RequestMethod.POST)
-    @ResponseBody
-    public String allocateUserAnswer(HttpServletResponse response, @RequestParam Long questionUid,
-	    @RequestParam Long targetOptionUid, @RequestParam Long previousOptionUid, @RequestParam String answer) {
-
-	Long optionUid = null;
-	boolean answerFoundInResults = false;
-
-	if (!targetOptionUid.equals(previousOptionUid) && StringUtils.isNotBlank(answer)) {
-	    /*
-	     * We need to synchronise this operation.
-	     * When multiple requests are made to modify the same option, for example to add a VSA answer,
-	     * we have a case of dirty reads.
-	     * One answer gets added, but while DB is still flushing,
-	     * another answer reads the option without the first answer,
-	     * because it is not there yet.
-	     * The second answer gets added, but the first one gets lost.
-	     *
-	     * We can not synchronise the method in service
-	     * as the "dirty" transaction is already started before synchronisation kicks in.
-	     * We do it here, before transaction starts.
-	     * It will not work for distributed environment, though.
-	     * If teachers allocate answers on different LAMS servers,
-	     * we can still get the same problem. We will need a more sophisticated solution then.
-	     */
-
-	    synchronized (service) {
-		optionUid = service.allocateAnswerToOption(questionUid, targetOptionUid, previousOptionUid, answer);
-	    }
-	    //recalculate marks for all lessons in all cases except for reshuffling inside the same container
-	    answerFoundInResults = service.recalculateMarksForAllocatedAnswer(questionUid, answer);
-	}
-
-	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
-	responseJSON.put("isAnswerDuplicated", optionUid != null);
-	responseJSON.put("optionUid", optionUid == null ? -1 : optionUid);
-	responseJSON.put("answerFoundInResults", answerFoundInResults);
-	response.setContentType("application/json;charset=utf-8");
-	return responseJSON.toString();
-    }
-
     @RequestMapping("/userSummary")
     public String userSummary(HttpServletRequest request, HttpServletResponse response) {
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9416dfbb422c46b7ee5f22c1cab3db64ef29570a -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9416dfbb422c46b7ee5f22c1cab3db64ef29570a)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -557,7 +557,7 @@
 	<c:if test="${vsaPresent}">
 		<div class="voffset5">
 			<a class="thickbox btn btn-default"
-			   href='<c:url value="/monitoring/displayVsaAllocate.do?toolContentID=${sessionMap.assessment.contentId}&KeepThis=true&TB_iframe=true&modal=true"/>'>
+			   href='<lams:LAMSURL />qb/vsa/displayVsaAllocate.do?toolContentID=${sessionMap.assessment.contentId}&KeepThis=true&TB_iframe=true&modal=true"/>'>
 				<fmt:message key="label.vsa.allocate.button" />
 			</a>
 		</div>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r70eb09e59b67dfc68c2cc425cd43e521c0d7fab8 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 70eb09e59b67dfc68c2cc425cd43e521c0d7fab8)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -2038,10 +2038,28 @@
     }
 
     @Override
-    public Collection<VsaAnswerDTO> getVsaAnswers(Long toolSessionId) {
+    public Collection<VsaAnswerDTO> getVSAnswers(Long toolSessionId) {
 	return new ArrayList<>();
     }
 
+    @Override
+    public boolean recalculateMarksForVsaQuestion(Long questionUid, String answer) {
+	// MCQ does not support VSA questions
+	return false;
+    }
+
+    @Override
+    public Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswersForActivity(long toolContentId) {
+	// MCQ does not support VSA questions
+	return null;
+    }
+
+    @Override
+    public Map<String, Integer> getUnallocatedVSAnswersForQuestion(long toolQuestionUid) {
+	// MCQ does not support VSA questions
+	return null;
+    }
+
     /**
      * Counts how many questions were answered correctly by the given user, regardless of the mark given.
      */
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -rd14e2d06385a0962178b89f4d5b8ac51e46e62f2 -r3085af1c7e3e6c3496af23a748d998886d7168fd
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision d14e2d06385a0962178b89f4d5b8ac51e46e62f2)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
@@ -590,12 +590,13 @@
     }
 
     @Override
-    public void recalculateScratchieMarksForVsaQuestion(Long qbQuestionUid, String answer) {
+    public boolean recalculateMarksForVsaQuestion(Long qbQuestionUid, String answer) {
 	List<Long> sessionIds = scratchieSessionDao.getSessionIdsByQbQuestion(qbQuestionUid, answer);
 	// recalculate marks if it's required
 	for (Long sessionId : sessionIds) {
 	    recalculateMarkForSession(sessionId, true);
 	}
+	return !sessionIds.isEmpty();
     }
 
     /**
@@ -1531,7 +1532,7 @@
 
 	    percentages[groupCount - 1] = percentage;
 	    groupCount++;
-	    
+
 	    row.addCell(summary.getMark());
 	    percentage = (numberOfItems == 0) ? 0 : (double) summary.getMark() / maxPossibleScore;
 	    row.addPercentageCell(percentage);
@@ -1545,7 +1546,7 @@
 	    sum += percentages[i];
 	}
 	int percentagesLength = percentages.length == 0 ? 1 : percentages.length;
-	double avgMean = (double) sum / percentagesLength;
+	double avgMean = sum / percentagesLength;
 	row = reportByTeamSheet.initRow();
 	row.addCell(getMessage("label.avg.mean"));
 	row.addEmptyCells(numberOfItems + 1);