Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
===================================================================
diff -u -rda506197047df06aabd8b50ffd781288b940a417 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java	(.../MockLearner.java)	(revision da506197047df06aabd8b50ffd781288b940a417)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java	(.../MockLearner.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -39,16 +39,17 @@
 import javax.websocket.MessageHandler;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.testharness.Call;
+import org.lamsfoundation.testharness.JsonUtil;
 import org.lamsfoundation.testharness.MockUser;
 import org.lamsfoundation.testharness.TestHarnessException;
 import org.lamsfoundation.testharness.TestUtil;
 import org.lamsfoundation.testharness.admin.MockAdmin;
 import org.xml.sax.SAXException;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.meterware.httpunit.Button;
 import com.meterware.httpunit.FormControl;
 import com.meterware.httpunit.WebForm;
@@ -98,7 +99,7 @@
     private static final String SCRATCHIE_IS_LEADER_SUBSTRING = "isUserLeader=true";
     private static final Pattern SCRATCHIE_TOOL_SESSION_ID_PATTERN = Pattern.compile("toolSessionID=' \\+ (\\d+)\\)");
     private static final String SCRATCHIE_FINISH_SESSION_SUBSTRING = "return finishSession()";
-    private static final Set<Long> SCRATCHIE_FINISHED_TOOL_CONTENT = new TreeSet<Long>();
+    private static final Set<Long> SCRATCHIE_FINISHED_TOOL_CONTENT = new TreeSet<>();
 
     private static final String CHAT_FINISH_SUBSTRING = "/lams/tool/lachat11/learning.do";
     private static final int CHAT_REPLIES = 3;
@@ -150,7 +151,7 @@
     private static final String SCRIBE_SUBMIT_REFLECTION_SUBSTRING = "value=\"submitReflection\"";
     private static final Pattern SCRIBE_REPORT_ENTRY_PATTERN = Pattern.compile("id=\"report-(\\d+)\"");
     private static final Pattern SCRIBE_TOOL_SESSION_ID_PATTERN = Pattern.compile("toolSessionID=' \\+ (\\d+)\\)");
-    private static final Set<Long> SCRIBE_FINISHED_TOOL_CONTENT = new TreeSet<Long>();
+    private static final Set<Long> SCRIBE_FINISHED_TOOL_CONTENT = new TreeSet<>();
     private static final short SCRIBE_SUBMIT_REPORT_ATTEMPTS = 3;
 
     private static final String NB_SUBSTRING = "/lams/tool/lanb11/";
@@ -231,7 +232,7 @@
     }
 
     private static Map<String, List<Button>> groupButtonsByName(Button[] btns, String buttonType) {
-	Map<String, List<Button>> buttonGroups = new HashMap<String, List<Button>>();
+	Map<String, List<Button>> buttonGroups = new HashMap<>();
 	if (btns != null) {
 	    for (Button btn : btns) {
 		if (buttonType.equals(btn.getType())) {
@@ -240,7 +241,7 @@
 		    if (!buttonGroups.containsKey(name)) {
 			buttonGroups.get(name).add(btn);
 		    } else {
-			List<Button> buttons = new ArrayList<Button>();
+			List<Button> buttons = new ArrayList<>();
 			buttons.add(btn);
 			buttonGroups.put(name, buttons);
 		    }
@@ -564,21 +565,17 @@
 	});
 
 	// send few messages to the whole group
-	JSONObject messageJSON = new JSONObject();
-	try {
-	    messageJSON.put("toolSessionID", toolSessionID);
-	    messageJSON.put("toUser", "");
-	    for (int replyIndex = 0; replyIndex < MockLearner.CHAT_REPLIES; replyIndex++) {
-		String message = MockLearner.composeArbitraryText();
-		messageJSON.put("message", message);
-		// send message to websocket
-		websocketClient.sendMessage(messageJSON.toString());
-		delay();
-	    }
-	    websocketClient.close();
-	} catch (JSONException e) {
-	    throw new IOException("Error while creating Chat JSON for websocket", e);
+	ObjectNode messageJSON = JsonNodeFactory.instance.objectNode();
+	messageJSON.put("toolSessionID", toolSessionID);
+	messageJSON.put("toUser", "");
+	for (int replyIndex = 0; replyIndex < MockLearner.CHAT_REPLIES; replyIndex++) {
+	    String message = MockLearner.composeArbitraryText();
+	    messageJSON.put("message", message);
+	    // send message to websocket
+	    websocketClient.sendMessage(messageJSON.toString());
+	    delay();
 	}
+	websocketClient.close();
     }
 
     private WebResponse handleToolForum(WebResponse resp) throws SAXException, IOException {
@@ -706,12 +703,12 @@
 	    if (isLeader) {
 		// find all answers on the page
 		m = MockLearner.SCRATCHIE_SCRATCH_PATTERN.matcher(asText);
-		Map<Long, List<Long>> uids = new TreeMap<Long, List<Long>>();
+		Map<Long, List<Long>> uids = new TreeMap<>();
 		while (m.find()) {
 		    Long questionID = Long.valueOf(m.group(1));
 		    List<Long> answerUids = uids.get(questionID);
 		    if (answerUids == null) {
-			answerUids = new ArrayList<Long>();
+			answerUids = new ArrayList<>();
 			uids.put(questionID, answerUids);
 		    }
 		    answerUids.add(Long.valueOf(m.group(2)));
@@ -761,8 +758,8 @@
 				log.debug(username + " received Scratchie " + toolSessionID + " message from server: "
 					+ message);
 				try {
-				    JSONObject responseJSON = new JSONObject(message);
-				    if (responseJSON.optBoolean("close")) {
+				    ObjectNode responseJSON = JsonUtil.readObject(message);
+				    if (JsonUtil.optBoolean(responseJSON, "close")) {
 					// mark the activity as finished for everyone
 					SCRATCHIE_FINISHED_TOOL_CONTENT.add(toolSessionID);
 				    }
@@ -828,73 +825,68 @@
 	String websocketURL = test.getTestSuite().getTargetServer().replace("http", "ws")
 		+ "/lams/tool/lascrb11/learningWebsocket?toolSessionID=" + toolSessionID;
 	String sessionID = wc.getCookieJar().getCookieValue("JSESSIONID");
-	try {
-	    if (isScribe) {
-		WebsocketClient websocketClient = new WebsocketClient(websocketURL, sessionID,
-			new MessageHandler.Whole<String>() {
-			    @Override
-			    public void onMessage(String message) {
-				log.debug(username + " (scribe) received Scribe " + toolSessionID
-					+ " message from server: " + message);
-			    }
-			});
+	if (isScribe) {
+	    WebsocketClient websocketClient = new WebsocketClient(websocketURL, sessionID,
+		    new MessageHandler.Whole<String>() {
+			@Override
+			public void onMessage(String message) {
+			    log.debug(username + " (scribe) received Scribe " + toolSessionID + " message from server: "
+				    + message);
+			}
+		    });
 
-		// send few version of reports
-		JSONObject requestJSON = new JSONObject();
-		requestJSON.put("type", "submitReport");
-		for (short attempt = 0; attempt < SCRIBE_SUBMIT_REPORT_ATTEMPTS; attempt++) {
-		    JSONArray reportsJSON = new JSONArray();
-		    m = MockLearner.SCRIBE_REPORT_ENTRY_PATTERN.matcher(asText);
-		    while (m.find()) {
-			JSONObject reportJSON = new JSONObject();
-			reportJSON.put("uid", m.group(1));
-			reportJSON.put("text", MockLearner.composeArbitraryText());
-			reportsJSON.put(reportJSON);
-		    }
-		    requestJSON.put("reports", reportsJSON);
-		    websocketClient.sendMessage(requestJSON.toString());
-
-		    delay();
+	    // send few version of reports
+	    ObjectNode requestJSON = JsonNodeFactory.instance.objectNode();
+	    requestJSON.put("type", "submitReport");
+	    for (short attempt = 0; attempt < SCRIBE_SUBMIT_REPORT_ATTEMPTS; attempt++) {
+		ArrayNode reportsJSON = JsonNodeFactory.instance.arrayNode();
+		m = MockLearner.SCRIBE_REPORT_ENTRY_PATTERN.matcher(asText);
+		while (m.find()) {
+		    ObjectNode reportJSON = JsonNodeFactory.instance.objectNode();
+		    reportJSON.put("uid", m.group(1));
+		    reportJSON.put("text", MockLearner.composeArbitraryText());
+		    reportsJSON.add(reportJSON);
 		}
+		requestJSON.set("reports", reportsJSON);
+		websocketClient.sendMessage(requestJSON.toString());
 
-		websocketClient.close();
-		log.debug(username + " (scribe) force completes scribe " + toolSessionID);
-		return (WebResponse) new Call(wc, test, username + " the scribe force completes Scribe", form)
-			.execute();
-	    } else {
-		WebsocketClient websocketClient = new WebsocketClient(websocketURL, sessionID,
-			new MessageHandler.Whole<String>() {
-			    @Override
-			    public void onMessage(String message) {
-				log.debug(username + " (regular learner) received Scribe " + toolSessionID
-					+ " message from server: " + message);
-				try {
-				    JSONObject responseJSON = new JSONObject(message);
-				    if (responseJSON.optBoolean("close")) {
-					// mark the activity as finished for everyone
-					SCRIBE_FINISHED_TOOL_CONTENT.add(toolSessionID);
-				    }
-				} catch (JSONException e) {
-				    log.error("JSON exception in Scribe " + toolSessionID, e);
+		delay();
+	    }
+
+	    websocketClient.close();
+	    log.debug(username + " (scribe) force completes scribe " + toolSessionID);
+	    return (WebResponse) new Call(wc, test, username + " the scribe force completes Scribe", form).execute();
+	} else {
+	    WebsocketClient websocketClient = new WebsocketClient(websocketURL, sessionID,
+		    new MessageHandler.Whole<String>() {
+			@Override
+			public void onMessage(String message) {
+			    log.debug(username + " (regular learner) received Scribe " + toolSessionID
+				    + " message from server: " + message);
+			    try {
+				ObjectNode responseJSON = JsonUtil.readObject(message);
+				if (JsonUtil.optBoolean(responseJSON, "close")) {
+				    // mark the activity as finished for everyone
+				    SCRIBE_FINISHED_TOOL_CONTENT.add(toolSessionID);
 				}
+			    } catch (IOException e) {
+				log.error("JSON exception in Scribe " + toolSessionID, e);
 			    }
-			});
+			}
+		    });
 
-		// vote few times
-		JSONObject requestJSON = new JSONObject();
-		requestJSON.put("type", "vote");
-		for (short attempt = 0; attempt < SCRIBE_SUBMIT_REPORT_ATTEMPTS
-			&& !SCRIBE_FINISHED_TOOL_CONTENT.contains(toolSessionID); attempt++) {
-		    websocketClient.sendMessage(requestJSON.toString());
-		    delay();
-		}
-
-		websocketClient.close();
-		return (WebResponse) new Call(wc, test, username + " refreshes Scribe",
-			MockLearner.findURLInLocationHref(resp, SCRIBE_TOOL_SUBSTRING)).execute();
+	    // vote few times
+	    ObjectNode requestJSON = JsonNodeFactory.instance.objectNode();
+	    requestJSON.put("type", "vote");
+	    for (short attempt = 0; attempt < SCRIBE_SUBMIT_REPORT_ATTEMPTS
+		    && !SCRIBE_FINISHED_TOOL_CONTENT.contains(toolSessionID); attempt++) {
+		websocketClient.sendMessage(requestJSON.toString());
+		delay();
 	    }
-	} catch (JSONException e) {
-	    throw new IOException("Error while trying to create Scribe JSON for websocket", e);
+
+	    websocketClient.close();
+	    return (WebResponse) new Call(wc, test, username + " refreshes Scribe",
+		    MockLearner.findURLInLocationHref(resp, SCRIBE_TOOL_SUBSTRING)).execute();
 	}
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
===================================================================
diff -u -rc368a79cdaf7adf21f3185b6bdccd024320982c9 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java	(.../OrgManageAction.java)	(revision c368a79cdaf7adf21f3185b6bdccd024320982c9)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java	(.../OrgManageAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -33,9 +33,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.admin.web.form.OrgManageForm;
 import org.lamsfoundation.lams.security.ISecurityService;
@@ -55,6 +52,10 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * <p>
  * <a href="OrgManageAction.java.html"><i>View Source</i></a>
@@ -66,7 +67,6 @@
 
     private static IUserManagementService userManagementService;
 
-    @SuppressWarnings("unchecked")
     @Override
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
@@ -157,7 +157,7 @@
      * Returns list of organisations for .
      */
     public ActionForward getOrgs(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	    HttpServletResponse res) throws IOException, ServletException {
 	initServices();
 
 	Integer parentOrgId = WebUtil.readIntParam(request, "parentOrgId");
@@ -199,14 +199,13 @@
 	List<Organisation> organisations = userManagementService.getPagedCourses(parentOrgId, typeId, stateId, page,
 		size, sortBy, sortOrder, searchString);
 
-	JSONObject responcedata = new JSONObject();
-	responcedata.put("total_rows", userManagementService.getCountCoursesByParentCourseAndTypeAndState(parentOrgId,
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put("total_rows", userManagementService.getCountCoursesByParentCourseAndTypeAndState(parentOrgId,
 		typeId, stateId, searchString));
 
-	JSONArray rows = new JSONArray();
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
 	for (Organisation organisation : organisations) {
-
-	    JSONObject responseRow = new JSONObject();
+	    ObjectNode responseRow = JsonNodeFactory.instance.objectNode();
 	    responseRow.put("id", organisation.getOrganisationId());
 	    String orgName = organisation.getName() == null ? "" : organisation.getName();
 	    responseRow.put("name", StringEscapeUtils.escapeHtml(orgName));
@@ -216,11 +215,12 @@
 		    : FileUtil.EXPORT_TO_SPREADSHEET_TITLE_DATE_FORMAT.format(organisation.getCreateDate());
 	    responseRow.put("createDate", orgCreateDate);
 
-	    rows.put(responseRow);
+	    rows.add(responseRow);
 	}
-	responcedata.put("rows", rows);
+
+	responseJSON.set("rows", rows);
 	res.setContentType("application/json;charset=utf-8");
-	res.getWriter().print(new String(responcedata.toString()));
+	res.getWriter().print(responseJSON.toString());
 	return null;
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java	(.../OrganisationAction.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java	(.../OrganisationAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -37,6 +38,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
@@ -52,12 +54,6 @@
 
 /**
  * @author Fei Yang
- *
- *
- *
- *
- *
- *
  */
 public class OrganisationAction extends LamsDispatchAction {
 
@@ -66,6 +62,7 @@
     private static List<SupportedLocale> locales;
     private static List status;
 
+    @SuppressWarnings("unchecked")
     public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	OrganisationAction.service = AdminServiceProxy.getService(getServlet().getServletContext());
@@ -91,6 +88,18 @@
 			orgForm.set("stateId", org.getOrganisationState().getOrganisationStateId());
 			SupportedLocale locale = org.getLocale();
 			orgForm.set("localeId", locale != null ? locale.getLocaleId() : null);
+
+			// find a course or subcourse with any lessons, so we warn user when he tries to delete the course
+			Integer courseToDeleteLessons = org.getLessons().size() > 0 ? orgId : null;
+			if (courseToDeleteLessons == null) {
+			    for (Organisation subcourse : (Set<Organisation>) org.getChildOrganisations()) {
+				if (subcourse.getLessons().size() > 0) {
+				    courseToDeleteLessons = subcourse.getOrganisationId();
+				    break;
+				}
+			    }
+			}
+			request.setAttribute("courseToDeleteLessons", courseToDeleteLessons);
 		    }
 		    request.getSession().setAttribute("locales", OrganisationAction.locales);
 		    request.getSession().setAttribute("status", OrganisationAction.status);
@@ -149,23 +158,71 @@
 	return null;
     }
 
+    public ActionForward deleteAllLessonsInit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException {
+	if (!AdminServiceProxy.getSecurityService(getServlet().getServletContext()).isSysadmin(getUserID(),
+		"display cleanup preview lessons", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin");
+	    return null;
+	}
+
+	if (!(request.isUserInRole(Role.SYSADMIN))) {
+	    request.setAttribute("errorName", "OrganisationAction");
+	    request.setAttribute("errorMessage", AdminServiceProxy.getMessageService(getServlet().getServletContext())
+		    .getMessage("error.need.sysadmin"));
+	    return mapping.findForward("error");
+	}
+
+	Integer organisationId = WebUtil.readIntParam(request, "orgId");
+	Organisation organisation = (Organisation) AdminServiceProxy.getService(getServlet().getServletContext())
+		.findById(Organisation.class, organisationId);
+	int lessonCount = organisation.getLessons().size();
+	request.setAttribute("lessonCount", lessonCount);
+	request.setAttribute("courseName", organisation.getName());
+
+	return mapping.findForward("deleteAllLessons");
+    }
+
+    @SuppressWarnings("unchecked")
+    public ActionForward deleteAllLessons(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException {
+	Integer userID = getUserID();
+	Integer limit = WebUtil.readIntParam(request, "limit", true);
+	Integer organisationId = WebUtil.readIntParam(request, "orgId");
+	Organisation organisation = (Organisation) AdminServiceProxy.getService(getServlet().getServletContext())
+		.findById(Organisation.class, organisationId);
+	for (Lesson lesson : (Set<Lesson>) organisation.getLessons()) {
+	    log.info("Deleting lesson: " + lesson.getLessonId());
+	    // role is checked in this method
+	    AdminServiceProxy.getMonitoringService(getServlet().getServletContext())
+		    .removeLessonPermanently(lesson.getLessonId(), userID);
+	    if (limit != null) {
+		limit--;
+		if (limit == 0) {
+		    break;
+		}
+	    }
+	}
+
+	organisation = (Organisation) AdminServiceProxy.getService(getServlet().getServletContext())
+		.findById(Organisation.class, organisationId);
+	response.setContentType("application/json;charset=utf-8");
+	response.getWriter().print(organisation.getLessons().size());
+	return null;
+    }
+
     private ActionForward error(ActionMapping mapping, HttpServletRequest request) {
 	OrganisationAction.messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
 	request.setAttribute("errorName", "OrganisationAction");
 	request.setAttribute("errorMessage", OrganisationAction.messageService.getMessage("error.authorisation"));
 	return mapping.findForward("error");
     }
 
-    /*
-     * public ActionForward remove(ActionMapping mapping, ActionForm form,HttpServletRequest request,
-     * HttpServletResponse response){
-     * Integer orgId = WebUtil.readIntParam(request,"orgId");
-     * getService().deleteById(Organisation.class,orgId);
-     * Integer parentId = WebUtil.readIntParam(request,"parentId");
-     * request.setAttribute("org",parentId);
-     * return mapping.findForward("orglist");
-     * }
-     */
+    private Integer getUserID() {
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	return user == null ? null : user.getUserID();
+    }
 
     @SuppressWarnings("unchecked")
     private void initLocalesAndStatus() {
Index: lams_build/conf/domain.xml
===================================================================
diff -u -r713c85b7c18fa089747d0749e09d40bc15b6b422 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision 713c85b7c18fa089747d0749e09d40bc15b6b422)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -1,13 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" ?>
 
-<domain xmlns="urn:jboss:domain:2.2">
+<domain xmlns="urn:jboss:domain:4.2">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
         <extension module="org.jboss.as.connector"/>
         <extension module="org.jboss.as.ee"/>
         <extension module="org.jboss.as.ejb3"/>
-        <extension module="org.jboss.as.jacorb"/>
         <extension module="org.jboss.as.jaxrs"/>
         <extension module="org.jboss.as.jdr"/>
         <extension module="org.jboss.as.jmx"/>
@@ -16,7 +15,6 @@
         <extension module="org.jboss.as.jsr77"/>
         <extension module="org.jboss.as.logging"/>
         <extension module="org.jboss.as.mail"/>
-        <extension module="org.jboss.as.messaging"/>
         <extension module="org.jboss.as.modcluster"/>
         <extension module="org.jboss.as.naming"/>
         <extension module="org.jboss.as.pojo"/>
@@ -26,8 +24,13 @@
         <extension module="org.jboss.as.transactions"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
-        <extension module="org.wildfly.extension.batch"/>
+        <extension module="org.wildfly.extension.batch.jberet"/>
+        <extension module="org.wildfly.extension.bean-validation"/>
+        <extension module="org.wildfly.extension.clustering.singleton"/>
         <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.messaging-activemq"/>
+        <extension module="org.wildfly.extension.request-controller"/>
+        <extension module="org.wildfly.extension.security.manager"/>
         <extension module="org.wildfly.extension.undertow"/>
     </extensions>
     <system-properties>
@@ -47,60 +50,92 @@
     </management>
     <profiles>
         <profile name="ha">
-            <subsystem xmlns="urn:jboss:domain:logging:2.0">
-               <use-deployment-logging-config value="false"/>
-                <console-handler name="CONSOLE">
-                    <level name="INFO"/>
+            <subsystem xmlns="urn:jboss:domain:logging:3.0">
+                <use-deployment-logging-config value="false"/>
+            	<add-logging-api-dependencies value="true" />
+
+            	<periodic-rotating-file-handler name="FILE" autoflush="true">
                     <formatter>
-                        <named-formatter name="CONSOLEPATTERN"/>
-                    </formatter>
-                    <target name="System.out"/>
-                </console-handler>
-                <console-handler name="LAMSCONSOLE">
-                    <level name="DEBUG"/>
-                    <formatter>
-                        <named-formatter name="LAMSCONSOLEPATTERN"/>
-                    </formatter>
-                    <target name="System.out"/>
-                </console-handler>
-                <periodic-rotating-file-handler name="FILE" autoflush="true">
-                    <formatter>
                         <named-formatter name="PATTERN"/>
                     </formatter>
                     <file relative-to="jboss.server.log.dir" path="server.log"/>
                     <suffix value="'.'yyyy-MM-dd"/>
                     <append value="true"/>
                 </periodic-rotating-file-handler>
-                <periodic-rotating-file-handler name="AUDITFILE" autoflush="true">
+
+	            <console-handler name="CONSOLE">
+	                <target name="System.out" />
+	                <level name="INFO" />
+	                <formatter>
+	                    <named-formatter name="CONSOLEPATTERN" />
+	                </formatter>
+	            </console-handler>
+	
+	            <periodic-rotating-file-handler name="AUDITFILE" autoflush="true">
+	                    <level name="INFO"/>
+	                    <formatter>
+	                        <named-formatter name="AUDITPATTERN"/>
+	                    </formatter>
+	                    <file relative-to="jboss.server.log.dir" path="audit.log"/>
+	                    <suffix value="'.'yyyy-MM-dd"/>
+	                    <append value="true"/>
+	                </periodic-rotating-file-handler>
+	
+	            <size-rotating-file-handler name="LAMSFILE" autoflush="true">
+	                    <level name="DEBUG"/>
+	                    <formatter>
+	                        <named-formatter name="LAMSPATTERN"/>
+	                    </formatter>
+	                    <file relative-to="jboss.server.log.dir" path="lams.log"/>
+	                    <rotate-size value="5m"/>
+	                    <max-backup-index value="20"/>
+	                    <append value="true"/>
+	                </size-rotating-file-handler>
+	
+	            <console-handler name="LAMSCONSOLE">
+	                <target name="System.out" />
+	                <level name="DEBUG" />
+	                <formatter>
+	                    <named-formatter name="LAMSCONSOLEPATTERN" />
+	                </formatter>
+	            </console-handler>
+	
+	            <size-rotating-file-handler name="HIBERNATEFILE" autoflush="true">
                     <level name="INFO"/>
                     <formatter>
-                        <named-formatter name="AUDITPATTERN"/>
-                    </formatter>
-                    <file relative-to="jboss.server.log.dir" path="audit.log"/>
-                    <suffix value="'.'yyyy-MM-dd"/>
-                    <append value="true"/>
-                </periodic-rotating-file-handler>
-                <size-rotating-file-handler name="LAMSFILE" autoflush="true">
-                    <level name="DEBUG"/>
-                    <formatter>
-                        <named-formatter name="LAMSPATTERN"/>
-                    </formatter>
-                    <file relative-to="jboss.server.log.dir" path="lams.log"/>
-                    <rotate-size value="5m"/>
-                    <max-backup-index value="20"/>
-                    <append value="true"/>
-                </size-rotating-file-handler>
-                <size-rotating-file-handler name="HIBERNATEFILE" autoflush="true">
-                    <level name="INFO"/>
-                    <formatter>
                         <named-formatter name="HIBERNATEPATTERN"/>
                     </formatter>
                     <file relative-to="jboss.server.log.dir" path="hibernatelams.log"/>
                     <rotate-size value="5m"/>
                     <max-backup-index value="20"/>
                     <append value="true"/>
                 </size-rotating-file-handler>
-                <logger category="org.lamsfoundation.lams" use-parent-handlers="false">
+	
+	            <!-- ISO8601 date format -->
+	            <formatter name="HIBERNATEPATTERN">
+	                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c - %m%n" />
+	            </formatter>
+	            <formatter name="LAMSCONSOLEPATTERN">
+	                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+	            </formatter>
+	            <formatter name="LAMSPATTERN">
+	                <pattern-formatter
+	                    pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n" />
+	            </formatter>
+	            <formatter name="AUDITPATTERN">
+	                <pattern-formatter
+	                    pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n" />
+	            </formatter>
+	
+	            <!-- ABSOLUTE date format -->
+	            <formatter name="CONSOLEPATTERN">
+	                <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+	            </formatter>
+	            <formatter name="PATTERN">
+	                <pattern-formatter pattern="%d %-5p [%c] (%t) %m%n" />
+	            </formatter>
+	
+	            <logger category="org.lamsfoundation.lams" use-parent-handlers="false">
                     <level name="DEBUG"/>
                     <handlers>
                         <handler name="LAMSFILE"/>
@@ -114,31 +149,22 @@
                         <handler name="LAMSCONSOLE"/>
                     </handlers>
                 </logger>
-                <logger category="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter" use-parent-handlers="false">
+
+            	<logger category="org.lamsfoundation.lams.util.audit" use-parent-handlers="false">
                     <level name="INFO"/>
                     <handlers>
-                        <handler name="LAMSFILE"/>
-                        <handler name="LAMSCONSOLE"/>
-                    </handlers>
-                </logger>
-                <logger category="org.lamsfoundation.lams.util.audit" use-parent-handlers="false">
-                    <level name="INFO"/>
-                    <handlers>
                         <handler name="AUDITFILE"/>
                     </handlers>
                 </logger>
-                <logger category="org.hibernate" use-parent-handlers="false">
+
+            	<logger category="org.hibernate"
+            		use-parent-handlers="false">
                     <level name="INFO"/>
                     <handlers>
                         <handler name="HIBERNATEFILE"/>
                     </handlers>
                 </logger>
-                <logger category="org.hibernate.engine.StatefulPersistenceContext" use-parent-handlers="false">
-                    <level name="ERROR"/>
-                    <handlers>
-                        <handler name="HIBERNATEFILE"/>
-                    </handlers>
-                </logger>
+
                 <logger category="org.springframework.beans.factory.support.DefaultListableBeanFactory">
                     <level name="INFO"/>
                 </logger>
@@ -178,7 +204,7 @@
                 <logger category="org.springframework.transaction.jta">
                     <level name="INFO"/>
                 </logger>
-                <logger category="org.springframework.orm.hibernate4">
+                <logger category="org.springframework.orm.hibernate5">
                     <level name="INFO"/>
                 </logger>
                 <logger category="org.springframework.beans.factory.annotation">
@@ -187,42 +213,37 @@
                 <logger category="org.apache.struts.tiles">
                     <level name="WARN"/>
                 </logger>
+                <logger category="com.arjuna">
+                    <level name="WARN"/>
+                </logger>
+                <logger category="org.jboss.as.config">
+                    <level name="DEBUG"/>
+                </logger>
+                <logger category="sun.rmi">
+                    <level name="WARN"/>
+                </logger>
+                
                 <root-logger>
                     <level name="DEBUG"/>
                     <handlers>
                         <handler name="CONSOLE"/>
                         <handler name="FILE"/>
                     </handlers>
                 </root-logger>
-                <formatter name="HIBERNATEPATTERN">
-                    <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c - %m%n"/>
-                </formatter>
-                <formatter name="LAMSCONSOLEPATTERN">
-                    <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/>
-                </formatter>
-                <formatter name="LAMSPATTERN">
-                    <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n"/>
-                </formatter>
-                <formatter name="AUDITPATTERN">
-                    <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n"/>
-                </formatter>
-                <formatter name="CONSOLEPATTERN">
-                    <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/>
-                </formatter>
-                <formatter name="PATTERN">
-                    <pattern-formatter pattern="%d %-5p [%c] (%t) %m%n"/>
-                </formatter>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:batch:1.0">
-                <job-repository>
+            <subsystem xmlns="urn:jboss:domain:batch-jberet:1.0">
+                <default-job-repository name="in-memory"/>
+                <default-thread-pool name="batch"/>
+                <job-repository name="in-memory">
                     <in-memory/>
                 </job-repository>
-                <thread-pool>
+                <thread-pool name="batch">
                     <max-threads count="10"/>
                     <keepalive-time time="30" unit="seconds"/>
                 </thread-pool>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:datasources:2.0">
+            <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:datasources:4.0">
                 <datasources>
                 <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="true">
 				    <connection-url>@db.url.run@</connection-url>
@@ -279,39 +300,45 @@
                 </drivers>
             </datasources>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:ee:2.0">
+            <subsystem xmlns="urn:jboss:domain:ee:4.0">
                 <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
                 <concurrent>
                     <context-services>
                         <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
                     </context-services>
+                    <managed-thread-factories>
+                        <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                    </managed-thread-factories>
                     <managed-executor-services>
-                        <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
+                        <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/>
                     </managed-executor-services>
                     <managed-scheduled-executor-services>
-                        <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
+                        <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
                     </managed-scheduled-executor-services>
-                    <managed-thread-factories>
-                        <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
-                    </managed-thread-factories>
                 </concurrent>
                 <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/lams-ds" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
+            <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
                 <session-bean>
+                    <stateless>
+                        <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                    </stateless>
                     <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/>
                     <singleton default-access-timeout="5000"/>
                 </session-bean>
+                <mdb>
+                    <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
+                    <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+                </mdb>
                 <pools>
                     <bean-instance-pools>
-                        <!-- A sample strict max pool configuration -->
-                        <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
-                        <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                        <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                        <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
                     </bean-instance-pools>
                 </pools>
                 <caches>
                     <cache name="simple"/>
-                    <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
+                    <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
                 </caches>
                 <passivation-stores>
                     <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
@@ -331,40 +358,71 @@
                 </thread-pools>
                 <default-security-domain value="other"/>
                 <default-missing-method-permissions-deny-access value="true"/>
+                <log-system-exceptions value="true"/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:io:1.1">
                 <worker name="default"/>
                 <buffer-pool name="default"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
+            <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
                 <cache-container name="server" aliases="singleton cluster" default-cache="default" module="org.wildfly.clustering.server">
                     <transport lock-timeout="60000"/>
-                    <replicated-cache name="default" mode="SYNC" batching="true">
-                        <locking isolation="REPEATABLE_READ"/>
+                    <replicated-cache name="default" mode="SYNC">
+                        <transaction mode="BATCH"/>
                     </replicated-cache>
                 </cache-container>
                 <cache-container name="web" default-cache="dist" module="org.wildfly.clustering.web.infinispan">
                     <transport lock-timeout="60000"/>
-                    <distributed-cache name="dist" mode="ASYNC" batching="true" l1-lifespan="0" owners="2">
+                    <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
+                        <locking isolation="REPEATABLE_READ"/>
+                        <transaction mode="BATCH" locking="OPTIMISTIC" />
                         <file-store/>
                     </distributed-cache>
+                    <distributed-cache name="concurrent" mode="SYNC" l1-lifespan="0" owners="2">
+                        <file-store/>
+                    </distributed-cache>
                 </cache-container>
                 <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan">
                     <transport lock-timeout="60000"/>
-                    <distributed-cache name="dist" mode="ASYNC" batching="true" l1-lifespan="0" owners="2">
+                    <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
+                        <locking isolation="REPEATABLE_READ"/>
+                        <transaction mode="BATCH"/>
                         <file-store/>
                     </distributed-cache>
                 </cache-container>
-                <cache-container name="hibernate" start="EAGER" module="org.hibernate">
-                    <local-cache name="entity" statistics-enabled="true"/>
-                    <local-cache name="local-query" statistics-enabled="true"/>
+                <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan">
+	                <local-cache name="entity" statistics-enabled="true">
+	                   <!-- 
+	                   	<transaction mode="NON_XA"/>
+	                    <eviction strategy="LRU" max-entries="50000"/>
+	                    <expiration max-idle="100000" lifespan="1000000"/>
+	                   -->
+	                </local-cache>
+	                <local-cache name="local-query" statistics-enabled="true">
+	                   <!--
+	                    <transaction mode="NONE"/>
+	                    <eviction strategy="LRU" max-entries="10000"/>
+	                    <expiration max-idle="100000"/>
+	                   -->
+	                </local-cache>
+	             <!-- 
+	                <local-cache name="timestamps" statistics-enabled="true">
+	                    <transaction mode="NONE"/>
+	                    <eviction strategy="NONE"/>
+	                </local-cache>
+	                <local-cache name="contentrepository-entity" statistics-enabled="true">
+	                    <transaction mode="NON_XA"/>
+	                    <eviction strategy="LRU" max-entries="200"/>
+	                    <expiration max-idle="100000" lifespan="900000"/>
+	                </local-cache>
+	             -->
                 </cache-container>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:jca:2.0">
+            <subsystem xmlns="urn:jboss:domain:jca:4.0">
                 <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
                 <bean-validation enabled="true"/>
-                <default-workmanager>
+ 				<default-workmanager>
                     <short-running-threads>
                         <core-threads count="50"/>
                         <queue-length count="50"/>
@@ -381,8 +439,12 @@
                 <cached-connection-manager/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:jgroups:2.0" default-stack="udp">
-                <stack name="udp">
+            <subsystem xmlns="urn:jboss:domain:jgroups:4.0">
+                <channels default="ee">
+                    <channel name="ee" stack="udp"/>
+                </channels>
+                <stacks>
+            		<stack name="udp">
                     <transport type="UDP" socket-binding="jgroups-udp"/>
                     <protocol type="PING"/>
                     <protocol type="MERGE3"/>
@@ -396,12 +458,11 @@
                     <protocol type="UFC"/>
                     <protocol type="MFC"/>
                     <protocol type="FRAG2"/>
-                    <protocol type="RSVP"/>
                 </stack>
                 <stack name="tcp">
                     <transport type="TCP" socket-binding="jgroups-tcp"/>
                     <protocol type="MPING" socket-binding="jgroups-mping"/>
-                    <protocol type="MERGE2"/>
+                    <protocol type="MERGE3"/>
                     <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/>
                     <protocol type="FD"/>
                     <protocol type="VERIFY_SUSPECT"/>
@@ -411,8 +472,8 @@
                     <protocol type="pbcast.GMS"/>
                     <protocol type="MFC"/>
                     <protocol type="FRAG2"/>
-                    <protocol type="RSVP"/>
-                </stack>
+                    </stack>
+                </stacks>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jmx:1.3">
                 <expose-resolved-model/>
@@ -423,12 +484,41 @@
                 <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
+            <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
             <subsystem xmlns="urn:jboss:domain:mail:2.0">
                 <mail-session name="default" jndi-name="java:jboss/mail/Default">
                     <smtp-server outbound-socket-binding-ref="mail-smtp"/>
                 </mail-session>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:modcluster:1.2">
+            <subsystem xmlns="urn:jboss:domain:messaging-activemq:1.0">
+                <server name="default">
+                    <cluster password="${jboss.messaging.cluster.password:mypass}"/>
+                    <security-setting name="#">
+                        <role name="guest" send="true" consume="true" create-non-durable-queue="true" delete-non-durable-queue="true"/>
+                    </security-setting>
+                    <address-setting name="#" dead-letter-address="jms.queue.DLQ" expiry-address="jms.queue.ExpiryQueue" max-size-bytes="10485760" page-size-bytes="2097152" message-counter-history-day-limit="10" redistribution-delay="1000"/>
+                    <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/>
+                    <http-connector name="http-connector-throughput" socket-binding="http" endpoint="http-acceptor-throughput">
+                        <param name="batch-delay" value="50"/>
+                    </http-connector>
+                    <in-vm-connector name="in-vm" server-id="0"/>
+                    <http-acceptor name="http-acceptor" http-listener="default"/>
+                    <http-acceptor name="http-acceptor-throughput" http-listener="default">
+                        <param name="batch-delay" value="50"/>
+                        <param name="direct-deliver" value="false"/>
+                    </http-acceptor>
+                    <in-vm-acceptor name="in-vm" server-id="0"/>
+                    <broadcast-group name="bg-group1" jgroups-channel="activemq-cluster" connectors="http-connector"/>
+                    <discovery-group name="dg-group1" jgroups-channel="activemq-cluster"/>
+                    <cluster-connection name="my-cluster" address="jms" connector-name="http-connector" discovery-group="dg-group1"/>
+                    <jms-queue name="ExpiryQueue" entries="java:/jms/queue/ExpiryQueue"/>
+                    <jms-queue name="DLQ" entries="java:/jms/queue/DLQ"/>
+                    <connection-factory name="InVmConnectionFactory" entries="java:/ConnectionFactory" connectors="in-vm"/>
+                    <connection-factory name="RemoteConnectionFactory" entries="java:jboss/exported/jms/RemoteConnectionFactory" connectors="http-connector" ha="true" block-on-acknowledge="true" reconnect-attempts="-1"/>
+                    <pooled-connection-factory name="activemq-ra" entries="java:/JmsXA java:jboss/DefaultJMSConnectionFactory" connectors="in-vm" transaction="xa"/>
+                </server>
+            </subsystem>
+            <subsystem xmlns="urn:jboss:domain:modcluster:2.0">
                 <mod-cluster-config advertise-socket="modcluster" connector="ajp">
                     <dynamic-load-provider>
                         <load-metric type="cpu"/>
@@ -439,11 +529,12 @@
                 <remote-naming/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-            <subsystem xmlns="urn:jboss:domain:remoting:2.0">
-                <endpoint worker="default"/>
+            <subsystem xmlns="urn:jboss:domain:remoting:3.0">
+                <endpoint/>
                 <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
+            <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0"/>
+            <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
             <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
             <subsystem xmlns="urn:jboss:domain:security:1.2">
                 <security-domains>
@@ -467,6 +558,14 @@
                             <policy-module code="Delegating" flag="required"/>
                         </authorization>
                     </security-domain>
+                    <security-domain name="jaspitest" cache-type="default">
+                        <authentication-jaspi>
+                            <login-module-stack name="dummy">
+                                <login-module code="Dummy" flag="optional"/>
+                            </login-module-stack>
+                            <auth-module code="Dummy"/>
+                        </authentication-jaspi>
+                    </security-domain>
                     <security-domain name="lams" cache-type="default">
                         <authentication>
                             <login-module code="org.lamsfoundation.lams.security.UniversalLoginModule" flag="required">
@@ -476,19 +575,34 @@
                     </security-domain>
                 </security-domains>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:transactions:2.0">
+            <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
+                <deployment-permissions>
+                    <maximum-set>
+                        <permission class="java.security.AllPermission"/>
+                    </maximum-set>
+                </deployment-permissions>
+            </subsystem>
+            <subsystem xmlns="urn:jboss:domain:singleton:1.0">
+                <singleton-policies default="default">
+                    <singleton-policy name="default" cache-container="server">
+                        <simple-election-policy/>
+                    </singleton-policy>
+                </singleton-policies>
+            </subsystem>
+            <subsystem xmlns="urn:jboss:domain:transactions:3.0">
                 <core-environment>
                     <process-id>
                         <uuid/>
                     </process-id>
                 </core-environment>
                 <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:undertow:1.2">
+            <subsystem xmlns="urn:jboss:domain:undertow:3.1">
                 <buffer-cache name="default"/>
                 <server name="default-server">
-                    <http-listener name="default" socket-binding="http" max-post-size="104857600"/>
                     <ajp-listener name="ajp" socket-binding="ajp"/>
+                    <http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true"/>
+                    <https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/>
                     <host name="default-host" alias="localhost">
                         <location name="/" handler="welcome-content"/>
 	                	 <!-- Removing server headers
@@ -500,20 +614,19 @@
                          -->
                     </host>
                 </server>
-                <servlet-container name="default" disable-caching-for-secured-pages="false">
-                    <jsp-config x-powered-by="false" trim-spaces="true"/>
+           		<servlet-container name="default" default-encoding="UTF-8" disable-caching-for-secured-pages="false">
+                	<jsp-config x-powered-by="false" development="true" trim-spaces="true"/>
                     <websockets/>
                 </servlet-container>
                 <handlers>
                     <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
                 </handlers>
                 <filters>
-                    <response-header name="hsts" header-name="Strict-Transport-Security" header-value="max-age=3600"/>
-                    <response-header name="server-header" header-name="Server" header-value="WildFly/8"/>
+                    <response-header name="server-header" header-name="Server" header-value="WildFly/10"/>
                     <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
                 </filters>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:webservices:1.2">
+        	<subsystem xmlns="urn:jboss:domain:webservices:2.0">
                 <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
                 <endpoint-config name="Standard-Endpoint-Config"/>
                 <endpoint-config name="Recording-Endpoint-Config">
@@ -523,7 +636,7 @@
                 </endpoint-config>
                 <client-config name="Standard-Client-Config"/>
             </subsystem>
-            <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
+        	<subsystem xmlns="urn:jboss:domain:weld:3.0"/>
         </profile>
     </profiles>
     <!--
@@ -538,19 +651,24 @@
     <interfaces>
         <interface name="management"/>
         <interface name="public"/>
-        <interface name="unsecure"/>
+        <interface name="private">
+            <inet-address value="${jboss.bind.address.private:127.0.0.1}"/>
+        </interface>
+        <interface name="unsecure">
+            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
+        </interface>
     </interfaces>
     <socket-binding-groups>
         <socket-binding-group name="ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
             <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="${jboss.https.port:8443}"/>
-            <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
-            <socket-binding name="jgroups-tcp" port="7600"/>
-            <socket-binding name="jgroups-tcp-fd" port="57600"/>
-            <socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
-            <socket-binding name="jgroups-udp-fd" port="54200"/>
+            <socket-binding name="jgroups-mping" interface="private" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
+            <socket-binding name="jgroups-tcp" interface="private" port="7600"/>
+            <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
+            <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
+            <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
             <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
             <socket-binding name="txn-status-manager" port="4713"/>
Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -r713c85b7c18fa089747d0749e09d40bc15b6b422 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 713c85b7c18fa089747d0749e09d40bc15b6b422)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:2.2">
+<server xmlns="urn:jboss:domain:4.2">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.connector"/>
@@ -67,7 +67,7 @@
         </access-control>
     </management>
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:2.0">
+        <subsystem xmlns="urn:jboss:domain:logging:3.0">
             <use-deployment-logging-config value="false" />
             <add-logging-api-dependencies value="true" />
 
@@ -174,16 +174,6 @@
                 </handlers>
             </logger>
 
-            <logger
-                category="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter"
-                use-parent-handlers="false">
-                <level name="INFO" />
-                <handlers>
-                    <handler name="LAMSFILE" />
-                    <handler name="LAMSCONSOLE" />
-                </handlers>
-            </logger>
-
             <logger category="org.lamsfoundation.lams.util.audit"
                 use-parent-handlers="false">
                 <level name="INFO" />
@@ -192,7 +182,8 @@
                 </handlers>
             </logger>
 
-            <logger category="org.hibernate" use-parent-handlers="false">
+            <logger category="org.hibernate"
+            	use-parent-handlers="false">
                 <level name="INFO" />
                 <handlers>
                     <handler name="HIBERNATEFILE" />
@@ -251,7 +242,7 @@
                 <level name="INFO"/>
             </logger>
             
-            <logger category="org.springframework.orm.hibernate4">
+            <logger category="org.springframework.orm.hibernate5">
                 <level name="INFO"/>
             </logger>
                         
@@ -271,9 +262,9 @@
                 </handlers>
             </root-logger>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
+        <subsystem xmlns="urn:jboss:domain:datasources:4.0">
             <datasources>
-                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false">
+                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="true">
 				    <connection-url>@db.url.run@</connection-url>
 				    <driver>MySQL</driver>
 				    <connection-property name="characterEncoding">utf8</connection-property>
@@ -331,7 +322,7 @@
         <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
             <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" auto-deploy-zipped="false" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:2.0">
+        <subsystem xmlns="urn:jboss:domain:ee:4.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <concurrent>
                 <context-services>
@@ -353,19 +344,28 @@
             <worker name="default"/>
             <buffer-pool name="default"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
+        <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
             <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
-                <local-cache name="default" />
+                <local-cache name="default">
+                    <transaction mode="BATCH"/>
+                </local-cache>
             </cache-container>
             <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
-                <local-cache name="passivation" batching="true">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
-                <local-cache name="persistent" batching="true">
+                <local-cache name="persistent">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
                     <file-store passivation="false" purge="false"/>
                 </local-cache>
+                <local-cache name="concurrent">
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
             </cache-container>
-			<cache-container name="hibernate" start="EAGER" module="org.hibernate">
+			<cache-container name="hibernate" module="org.hibernate">
                 <local-cache name="entity" statistics-enabled="true">
                    <!-- 
                    	<transaction mode="NON_XA"/>
@@ -393,7 +393,7 @@
              -->
             </cache-container>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jca:2.0">
+        <subsystem xmlns="urn:jboss:domain:jca:4.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -424,11 +424,11 @@
         <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+        <subsystem xmlns="urn:jboss:domain:remoting:3.0">
             <endpoint worker="default"/>
             <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
                 <security-domain name="other" cache-type="default">
@@ -463,7 +463,7 @@
             </core-environment>
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:undertow:1.2">
+        <subsystem xmlns="urn:jboss:domain:undertow:3.1">
             <buffer-cache name="default"/>
             <server name="default-server">
                 <http-listener name="default" socket-binding="http" max-post-size="104857600"/>
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r713c85b7c18fa089747d0749e09d40bc15b6b422 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 713c85b7c18fa089747d0749e09d40bc15b6b422)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<server xmlns="urn:jboss:domain:2.2">
+<server xmlns="urn:jboss:domain:4.2">
     <extensions>
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.connector"/>
@@ -76,7 +76,7 @@
         </access-control>
     </management>
     <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:2.0">
+        <subsystem xmlns="urn:jboss:domain:logging:3.0">
             <use-deployment-logging-config value="false" />
             <add-logging-api-dependencies value="true" />
 
@@ -183,16 +183,6 @@
                 </handlers>
             </logger>
 
-            <logger
-                category="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter"
-                use-parent-handlers="false">
-                <level name="INFO" />
-                <handlers>
-                    <handler name="LAMSFILE" />
-                    <handler name="LAMSCONSOLE" />
-                </handlers>
-            </logger>
-
             <logger category="org.lamsfoundation.lams.util.audit"
                 use-parent-handlers="false">
                 <level name="INFO" />
@@ -261,7 +251,7 @@
                 <level name="INFO"/>
             </logger>
             
-            <logger category="org.springframework.orm.hibernate4">
+            <logger category="org.springframework.orm.hibernate5">
                 <level name="INFO"/>
             </logger>
             
@@ -290,7 +280,7 @@
                 <keepalive-time time="30" unit="seconds"/>
             </thread-pool>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
+        <subsystem xmlns="urn:jboss:domain:datasources:4.0">
             <datasources>
                 <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="true">
 				    <connection-url>@db.url.run@</connection-url>
@@ -350,7 +340,7 @@
         <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
             <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" auto-deploy-zipped="false" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:2.0">
+        <subsystem xmlns="urn:jboss:domain:ee:4.0">
             <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
             <concurrent>
                 <context-services>
@@ -372,19 +362,28 @@
             <worker name="default"/>
             <buffer-pool name="default"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
+        <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
 			<cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
-                <local-cache name="default" />
+                <local-cache name="default">
+                    <transaction mode="BATCH"/>
+                </local-cache>
             </cache-container>
             <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
-                <local-cache name="passivation" batching="true">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
-                <local-cache name="persistent" batching="true">
+                <local-cache name="persistent">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
                     <file-store passivation="false" purge="false"/>
                 </local-cache>
+                <local-cache name="concurrent">
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
             </cache-container>
-			<cache-container name="hibernate" start="EAGER" module="org.hibernate">
+			<cache-container name="hibernate" module="org.hibernate">
                 <local-cache name="entity" statistics-enabled="true">
                    <!-- 
                    	<transaction mode="NON_XA"/>
@@ -413,7 +412,7 @@
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:2.0">
+        <subsystem xmlns="urn:jboss:domain:jca:4.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
             <default-workmanager>
@@ -451,11 +450,11 @@
             <remote-naming/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+        <subsystem xmlns="urn:jboss:domain:remoting:3.0">
             <endpoint worker="default"/>
             <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0"/>
         <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
@@ -491,7 +490,7 @@
             </core-environment>
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:undertow:1.2">
+        <subsystem xmlns="urn:jboss:domain:undertow:3.1">
             <buffer-cache name="default"/>
             <server name="default-server">
                 <http-listener name="default" socket-binding="http" max-post-size="104857600"/>
@@ -520,7 +519,7 @@
                 <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
             </filters>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:webservices:1.2">
+        <subsystem xmlns="urn:jboss:domain:webservices:2.0">
             <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
             <endpoint-config name="Standard-Endpoint-Config"/>
             <endpoint-config name="Recording-Endpoint-Config">
@@ -530,7 +529,7 @@
             </endpoint-config>
             <client-config name="Standard-Client-Config"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
+        <subsystem xmlns="urn:jboss:domain:weld:3.0"/>
     </profile>
     <interfaces>
         <interface name="management">
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r225d293907a5e2976e367ee3aa790239bad38699 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
===================================================================
diff -u -rf8946bae724b8a3f414aa1f6a27cd714fe8aae58 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision f8946bae724b8a3f414aa1f6a27cd714fe8aae58)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -43,9 +43,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.authoring.ObjectExtractorException;
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
@@ -79,22 +76,20 @@
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
  * @author Manpreet Minhas
- *
- *
- *
- *
  */
 public class AuthoringAction extends LamsDispatchAction {
 
@@ -123,29 +118,27 @@
     }
 
     public ActionForward openAuthoring(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
+	    HttpServletResponse response) throws IOException {
 	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, FileUtil.generateUniqueContentFolderID());
 
 	request.setAttribute("tools", getLearningDesignService().getToolDTOs(true, true, request.getRemoteUser()));
 	// build list of existing learning library groups
 	List<LearningLibraryGroup> groups = getLearningDesignService().getLearningLibraryGroups();
-	JSONArray groupsJSON = new JSONArray();
+	ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode();
 	for (LearningLibraryGroup group : groups) {
-	    JSONObject groupJSON = new JSONObject();
+	    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 	    groupJSON.put("name", group.getName());
 	    for (LearningLibrary learningLibrary : group.getLearningLibraries()) {
-		groupJSON.append("learningLibraries", learningLibrary.getLearningLibraryId());
+		groupJSON.withArray("learningLibraries").add(learningLibrary.getLearningLibraryId());
 	    }
-	    groupsJSON.put(groupJSON);
+	    groupsJSON.add(groupJSON);
 	}
 	request.setAttribute("learningLibraryGroups", groupsJSON.toString());
 
 	List<LearningDesignAccess> accessList = getAuthoringService().updateLearningDesignAccessByUser(getUserId());
 	accessList = accessList.subList(0,
 		Math.min(accessList.size(), AuthoringAction.LEARNING_DESIGN_ACCESS_ENTRIES_LIMIT - 1));
-	Gson gson = new GsonBuilder().create();
-	request.setAttribute("access", gson.toJson(accessList));
-
+	request.setAttribute("access", JsonUtil.toString(accessList));
 	request.setAttribute("licenses", getAuthoringService().getAvailableLicenses());
 
 	return mapping.findForward("openAutoring");
@@ -159,23 +152,22 @@
     }
 
     public ActionForward getToolOutputDefinitions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ServletException, IOException, JSONException {
+	    HttpServletResponse response) throws ServletException, IOException {
 	IAuthoringService authoringService = getAuthoringService();
 	Long toolContentID = WebUtil.readLongParam(request, "toolContentID");
 	Integer definitionType = ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION;
 
 	List<ToolOutputDefinitionDTO> defnDTOList = authoringService.getToolOutputDefinitions(toolContentID,
 		definitionType);
 
-	Gson gson = new GsonBuilder().create();
 	response.setContentType("application/json;charset=utf-8");
-	response.getWriter().write(gson.toJson(defnDTOList));
+	response.getWriter().write(JsonUtil.toString(defnDTOList));
 	return null;
     }
 
     @SuppressWarnings("unchecked")
     public ActionForward openLearningDesign(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ServletException, IOException, JSONException {
+	    HttpServletResponse response) throws ServletException, IOException {
 	long learningDesignID = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID);
 	LearningDesignDTO learningDesignDTO = getLearningDesignService().getLearningDesignDTO(learningDesignID,
 		getUserLanguage());
@@ -193,14 +185,13 @@
 	}
 
 	response.setContentType("application/json;charset=utf-8");
-	JSONObject responseJSON = new JSONObject();
-	Gson gson = new GsonBuilder().create();
-	responseJSON.put("ld", new JSONObject(gson.toJson(learningDesignDTO)));
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.set("ld", JsonUtil.readObject(learningDesignDTO));
 
 	List<LearningDesignAccess> accessList = getAuthoringService().updateLearningDesignAccessByUser(userId);
 	accessList = accessList.subList(0,
 		Math.min(accessList.size(), AuthoringAction.LEARNING_DESIGN_ACCESS_ENTRIES_LIMIT - 1));
-	responseJSON.put("access", new JSONArray(gson.toJson(accessList)));
+	responseJSON.set("access", JsonUtil.readArray(accessList));
 
 	response.getWriter().write(responseJSON.toString());
 	return null;
@@ -247,7 +238,7 @@
      * Creates a copy of default tool content.
      */
     public ActionForward createToolContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, JSONException {
+	    HttpServletResponse response) throws IOException, ServletException {
 	IAuthoringService authoringService = getAuthoringService();
 	Long toolID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_ID);
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID, true);
@@ -264,7 +255,7 @@
 
 	    String authorUrl = authoringService.getToolAuthorUrl(toolID, toolContentID, contentFolderID);
 	    if (authorUrl != null) {
-		JSONObject responseJSON = new JSONObject();
+		ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 		responseJSON.put("authorURL", authorUrl);
 		// return the generated values
 		responseJSON.put(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentID);
@@ -322,11 +313,11 @@
 		    null, false, false, false, false, true, true, false, false, true, null, null);
 	    Organisation organisation = getMonitoringService().getOrganisation(organisationID);
 
-	    List<User> staffList = new LinkedList<User>();
+	    List<User> staffList = new LinkedList<>();
 	    staffList.add(user);
 
 	    // add organisation's learners as lesson participants
-	    List<User> learnerList = new LinkedList<User>();
+	    List<User> learnerList = new LinkedList<>();
 	    Vector<User> learnerVector = getUserManagementService().getUsersFromOrganisationByRole(organisationID,
 		    Role.LEARNER, true);
 	    learnerList.addAll(learnerVector);
@@ -351,23 +342,21 @@
      * Stores Learning Desing created in Authoring.
      */
     public ActionForward saveLearningDesign(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, UserException, WorkspaceFolderException, IOException,
-	    ObjectExtractorException, ParseException {
-	JSONObject ldJSON = new JSONObject(request.getParameter("ld"));
+	    HttpServletResponse response)
+	    throws UserException, WorkspaceFolderException, IOException, ObjectExtractorException, ParseException {
+	ObjectNode ldJSON = JsonUtil.readObject(request.getParameter("ld"));
 
 	LearningDesign learningDesign = getAuthoringService().saveLearningDesignDetails(ldJSON);
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	if (learningDesign != null) {
 	    Long learningDesignID = learningDesign.getLearningDesignId();
 	    if (learningDesignID != null) {
 		responseJSON.put("learningDesignID", learningDesignID);
 
-		Gson gson = new GsonBuilder().create();
 		Vector<ValidationErrorDTO> validationDTOs = getAuthoringService()
 			.validateLearningDesign(learningDesignID);
-		String validationJSON = gson.toJson(validationDTOs);
-		responseJSON.put("validation", new JSONArray(validationJSON));
+		responseJSON.set("validation", JsonUtil.readArray(validationDTOs));
 	    }
 	}
 
@@ -386,10 +375,9 @@
 	List<LearningDesignAccess> accessList = getAuthoringService().updateLearningDesignAccessByUser(userId);
 	accessList = accessList.subList(0,
 		Math.min(accessList.size(), AuthoringAction.LEARNING_DESIGN_ACCESS_ENTRIES_LIMIT - 1));
-	Gson gson = new GsonBuilder().create();
 
 	response.setContentType("application/json;charset=utf-8");
-	response.getWriter().write(gson.toJson(accessList));
+	response.getWriter().write(JsonUtil.toString(accessList));
 	return null;
     }
 
@@ -417,16 +405,16 @@
     public ActionForward saveActivityCoordinates(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
 	try {
-	    JSONObject activityJSON = new JSONObject(request.getParameter("activity"));
-	    Activity activity = getMonitoringService().getActivityById(activityJSON.getLong("activityID"));
-	    activity.setXcoord(activityJSON.optInt("xCoord"));
-	    activity.setYcoord(activityJSON.optInt("yCoord"));
+	    ObjectNode activityJSON = JsonUtil.readObject(request.getParameter("activity"));
+	    Activity activity = getMonitoringService().getActivityById(JsonUtil.optLong(activityJSON, "activityID"));
+	    activity.setXcoord(JsonUtil.optInt(activityJSON, "xCoord"));
+	    activity.setYcoord(JsonUtil.optInt(activityJSON, "yCoord"));
 	    if (activity.isBranchingActivity()) {
 		BranchingActivity branchingActivity = (BranchingActivity) activity;
-		branchingActivity.setStartXcoord(activityJSON.getInt("startXCoord"));
-		branchingActivity.setEndXcoord(activityJSON.getInt("endXCoord"));
-		branchingActivity.setStartYcoord(activityJSON.getInt("startYCoord"));
-		branchingActivity.setEndYcoord(activityJSON.getInt("endYCoord"));
+		branchingActivity.setStartXcoord(JsonUtil.optInt(activityJSON, "startXCoord"));
+		branchingActivity.setEndXcoord(JsonUtil.optInt(activityJSON, "endXCoord"));
+		branchingActivity.setStartYcoord(JsonUtil.optInt(activityJSON, "startYCoord"));
+		branchingActivity.setEndYcoord(JsonUtil.optInt(activityJSON, "endYCoord"));
 	    }
 	    getUserManagementService().save(activity);
 	} catch (Exception e) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
===================================================================
diff -u -r1aff6aeac19473c0089c0f3ff578a183beb92555 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(.../OrganisationGroupAction.java)	(revision 1aff6aeac19473c0089c0f3ff578a183beb92555)
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(.../OrganisationGroupAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -44,9 +44,6 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.actions.DispatchAction;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException;
 import org.lamsfoundation.lams.integration.dto.ExtGroupDTO;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
@@ -71,12 +68,19 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.AlphanumComparator;
+import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 public class OrganisationGroupAction extends DispatchAction {
 
     private static Logger log = Logger.getLogger(OrganisationGroupAction.class);
@@ -216,7 +220,7 @@
 	Long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID, true);
 	request.setAttribute("canEdit", isGroupSuperuser || (activityId != null));
 
-	JSONObject orgGroupingJSON = new JSONObject();
+	ObjectNode orgGroupingJSON = JsonNodeFactory.instance.objectNode();
 	orgGroupingJSON.put("organisationId", organisationId);
 
 	Long orgGroupingId = WebUtil.readLongParam(request, "groupingId", true);
@@ -260,7 +264,7 @@
 	boolean isUsedForBranching = (lessonGrouping != null) && lessonGrouping.isUsedForBranching();
 	request.setAttribute(GroupingAJAXAction.PARAM_USED_FOR_BRANCHING, isUsedForBranching);
 
-	JSONArray orgGroupsJSON = new JSONArray();
+	ArrayNode orgGroupsJSON = JsonNodeFactory.instance.arrayNode();
 	Collection<User> learners = null;
 
 	// if teacher selected groups from integrated server - show them
@@ -300,19 +304,19 @@
 		// sort groups by their name
 		Collections.sort(extGroups);
 		for (ExtGroupDTO extGroup : extGroups) {
-		    JSONObject groupJSON = new JSONObject();
+		    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		    groupJSON.put("name", extGroup.getGroupName());
 		    groupJSON.put("groupId", extGroup.getGroupId());
 		    if (extGroup.getUsers() != null) {
 			for (User groupUser : (List<User>) extGroup.getUsers()) {
-			    JSONObject groupUserJSON = WebUtil.userToJSON(groupUser);
-			    groupJSON.append("users", groupUserJSON);
+			    ObjectNode groupUserJSON = WebUtil.userToJSON(groupUser);
+			    groupJSON.withArray("users").add(groupUserJSON);
 
 			    // remove the user who is already assigned to a group
 			    learners.remove(groupUser);
 			}
 		    }
-		    orgGroupsJSON.put(groupJSON);
+		    orgGroupsJSON.add(groupJSON);
 		}
 	    }
 
@@ -333,14 +337,14 @@
 	    orgGroupsJSON = getLessonGroupsDetails(lessonGroups, learners);
 	    request.setAttribute("skipInitialAssigning", true);
 	}
-	orgGroupingJSON.put("groups", orgGroupsJSON);
+	orgGroupingJSON.set("groups", orgGroupsJSON);
 	request.setAttribute("grouping", orgGroupingJSON);
 
 	// all the remaining users are unassigned to any group
-	JSONArray unassignedUsersJSON = new JSONArray();
+	ArrayNode unassignedUsersJSON = JsonNodeFactory.instance.arrayNode();
 	for (User unassignedUser : learners) {
-	    JSONObject unassignedUserJSON = WebUtil.userToJSON(unassignedUser);
-	    unassignedUsersJSON.put(unassignedUserJSON);
+	    ObjectNode unassignedUserJSON = WebUtil.userToJSON(unassignedUser);
+	    unassignedUsersJSON.add(unassignedUserJSON);
 	}
 	request.setAttribute("unassignedUsers", unassignedUsersJSON);
 
@@ -351,7 +355,7 @@
      * Saves a course grouping.
      */
     public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, InvalidParameterException, IOException {
+	    HttpServletResponse response) throws InvalidParameterException, IOException {
 	// check if user is allowed to edit groups
 	Integer userId = getUserDTO().getUserID();
 	int organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
@@ -368,38 +372,37 @@
 	}
 
 	// deserialize grouping
-	JSONObject orgGroupingJSON = new JSONObject(request.getParameter("grouping"));
+	ObjectNode orgGroupingJSON = new ObjectMapper().readValue(request.getParameter("grouping"), ObjectNode.class);
 	// check if already exists
-	Long orgGroupingId = orgGroupingJSON.optLong("groupingId");
+	Long orgGroupingId = orgGroupingJSON.get("groupingId").asLong();
 	if (orgGroupingId == 0L) {
 	    orgGroupingId = null;
 	}
 
 	// iterate over groups
 	List<OrganisationGroup> orgGroups = new LinkedList<>();
-	JSONArray orgGroupsJSON = orgGroupingJSON.optJSONArray("groups");
+	ArrayNode orgGroupsJSON = JsonUtil.optArray(orgGroupingJSON, "groups");
 	if (orgGroupsJSON != null) {
-	    for (int i = 0; i < orgGroupsJSON.length(); i++) {
+	    for (JsonNode orgGroupNode : orgGroupsJSON) {
 		// just overwrite existing groups; they will be updated if already exist
 		Set<User> users = new HashSet<>();
-		JSONObject orgGroupJSON = orgGroupsJSON.getJSONObject(i);
-		JSONArray usersJSON = orgGroupJSON.optJSONArray("users");
+		ObjectNode orgGroupJSON = (ObjectNode) orgGroupNode;
+		ArrayNode usersJSON = JsonUtil.optArray(orgGroupJSON, "users");
 		if (usersJSON != null) {
 		    // find user objects based on delivered IDs
-		    for (int j = 0; j < usersJSON.length(); j++) {
-			Integer learnerId = usersJSON.getInt(j);
-			User user = (User) getUserManagementService().findById(User.class, learnerId);
+		    for (JsonNode learnerId : usersJSON) {
+			User user = (User) getUserManagementService().findById(User.class, learnerId.asInt());
 			users.add(user);
 		    }
 		}
 
 		OrganisationGroup orgGroup = new OrganisationGroup();
-		Long orgGroupId = orgGroupJSON.optLong("groupId");
+		Long orgGroupId = JsonUtil.optLong(orgGroupJSON, "groupId");
 		if (orgGroupId > 0) {
 		    orgGroup.setGroupId(orgGroupId);
 		    orgGroup.setGroupingId(orgGroupingId);
 		}
-		orgGroup.setName(orgGroupJSON.optString("name", null));
+		orgGroup.setName(JsonUtil.optString(orgGroupJSON, "name"));
 		orgGroup.setUsers(users);
 
 		orgGroups.add(orgGroup);
@@ -416,7 +419,7 @@
 	    orgGrouping.setOrganisationId(organisationId);
 	}
 	// update grouping name
-	String orgGroupingName = orgGroupingJSON.getString("name");
+	String orgGroupingName = JsonUtil.optString(orgGroupingJSON, "name");
 	orgGrouping.setName(orgGroupingName);
 
 	getUserManagementService().saveOrganisationGrouping(orgGrouping, orgGroups);
@@ -453,36 +456,36 @@
      * Fetches course and branching so they can get matched by user.
      */
     public ActionForward getGroupsForMapping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
+	    HttpServletResponse response) throws IOException {
 	Long orgGroupingId = WebUtil.readLongParam(request, "groupingId");
 	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
 
 	OrganisationGrouping orgGrouping = (OrganisationGrouping) getUserManagementService()
 		.findById(OrganisationGrouping.class, orgGroupingId);
-	JSONArray groupsJSON = new JSONArray();
+	ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode();
 	SortedSet<OrganisationGroup> orgGroups = new TreeSet<>(orgGrouping.getGroups());
 	for (OrganisationGroup group : orgGroups) {
-	    JSONObject groupJSON = new JSONObject();
+	    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 	    groupJSON.put("id", group.getGroupId());
 	    groupJSON.put("name", group.getName());
-	    groupsJSON.put(groupJSON);
+	    groupsJSON.add(groupJSON);
 	}
 	Activity activity = (Activity) getUserManagementService().findById(Activity.class, activityID);
 	Grouping grouping = activity.isGroupingActivity() ? ((GroupingActivity) activity).getCreateGrouping()
 		: ((BranchingActivity) activity).getGrouping();
 
-	JSONArray branchesJSON = new JSONArray();
+	ArrayNode branchesJSON = JsonNodeFactory.instance.arrayNode();
 	SortedSet<Group> groups = new TreeSet<>(grouping.getGroups());
 	for (Group group : groups) {
-	    JSONObject groupJSON = new JSONObject();
+	    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 	    groupJSON.put("id", group.getGroupId());
 	    groupJSON.put("name", group.getGroupName());
-	    branchesJSON.put(groupJSON);
+	    branchesJSON.add(groupJSON);
 	}
 
-	JSONObject responseJSON = new JSONObject();
-	responseJSON.put("branches", branchesJSON);
-	responseJSON.put("groups", groupsJSON);
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.set("branches", branchesJSON);
+	responseJSON.set("groups", groupsJSON);
 
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().write(responseJSON.toString());
@@ -493,12 +496,12 @@
      * Stores course groups to branching groups mapping.
      */
     public ActionForward saveGroupMappings(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
-	JSONArray groupMapping = new JSONArray(request.getParameter("mapping"));
-	for (int index = 0; index < groupMapping.length(); index++) {
-	    JSONObject entry = groupMapping.getJSONObject(index);
-	    Long orgGroupID = entry.getLong("groupID");
-	    Long branchingGroupID = entry.getLong("branchID");
+	    HttpServletResponse response) throws IOException {
+	ArrayNode groupMapping = JsonUtil.readArray(request.getParameter("mapping"));
+	for (JsonNode entryNode : groupMapping) {
+	    ObjectNode entry = (ObjectNode) entryNode;
+	    Long orgGroupID = JsonUtil.optLong(entry, "groupID");
+	    Long branchingGroupID = JsonUtil.optLong(entry, "branchID");
 	    OrganisationGroup orgGroup = (OrganisationGroup) getUserManagementService()
 		    .findById(OrganisationGroup.class, orgGroupID);
 	    Group branchingGroup = (Group) getUserManagementService().findById(Group.class, branchingGroupID);
@@ -515,28 +518,28 @@
     /**
      * Build JSON objects based on existing lesson-level groups.
      */
-    private JSONArray getLessonGroupsDetails(Set<Group> groups, Collection<User> learners) throws JSONException {
+    private ArrayNode getLessonGroupsDetails(Set<Group> groups, Collection<User> learners) {
 	// serialize database group objects into JSON
-	JSONArray groupsJSON = new JSONArray();
+	ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode();
 	if (groups != null) {
 	    // sort groups by their name
 	    List<Group> groupList = new LinkedList<>(groups);
 	    Collections.sort(groupList, new GroupComparator());
 	    for (Group group : groupList) {
-		JSONObject groupJSON = new JSONObject();
+		ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		groupJSON.put("name", group.getGroupName());
 		groupJSON.put("groupId", group.getGroupId());
 		groupJSON.put("locked", !group.mayBeDeleted());
 		if (group.getUsers() != null) {
 		    for (User groupUser : group.getUsers()) {
-			JSONObject groupUserJSON = WebUtil.userToJSON(groupUser);
-			groupJSON.append("users", groupUserJSON);
+			ObjectNode groupUserJSON = WebUtil.userToJSON(groupUser);
+			groupJSON.withArray("users").add(groupUserJSON);
 
 			// remove the user who is already assigned to a group
 			learners.remove(groupUser);
 		    }
 		}
-		groupsJSON.put(groupJSON);
+		groupsJSON.add(groupJSON);
 	    }
 	}
 
@@ -546,8 +549,7 @@
     /**
      * Build JSON objects based on existing course-level groups.
      */
-    private JSONArray getOrgGroupsDetails(Set<OrganisationGroup> groups, Collection<User> learners)
-	    throws JSONException {
+    private ArrayNode getOrgGroupsDetails(Set<OrganisationGroup> groups, Collection<User> learners) {
 
 	final Comparator<OrganisationGroup> ORG_GROUP_COMPARATOR = new Comparator<OrganisationGroup>() {
 	    @Override
@@ -561,25 +563,25 @@
 	};
 
 	// serialize database group objects into JSON
-	JSONArray groupsJSON = new JSONArray();
+	ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode();
 	if (groups != null) {
 	    // sort groups by their name
 	    List<OrganisationGroup> groupList = new LinkedList<>(groups);
 	    Collections.sort(groupList, ORG_GROUP_COMPARATOR);
 
 	    for (OrganisationGroup group : groupList) {
-		JSONObject groupJSON = new JSONObject();
+		ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		groupJSON.put("name", group.getName());
 		groupJSON.put("groupId", group.getGroupId());
 		for (User groupUser : group.getUsers()) {
-		    JSONObject groupUserJSON = WebUtil.userToJSON(groupUser);
-		    groupJSON.append("users", groupUserJSON);
+		    ObjectNode groupUserJSON = WebUtil.userToJSON(groupUser);
+		    groupJSON.withArray("users").add(groupUserJSON);
 
 		    // remove the user who is already assigned to a group
 		    learners.remove(groupUser);
 		}
 
-		groupsJSON.put(groupJSON);
+		groupsJSON.add(groupJSON);
 	    }
 	}
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
===================================================================
diff -u -rf8946bae724b8a3f414aa1f6a27cd714fe8aae58 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java	(.../LtiAction.java)	(revision f8946bae724b8a3f414aa1f6a27cd714fe8aae58)
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java	(.../LtiAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -15,7 +15,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionRedirect;
-import org.apache.tomcat.util.json.JSONException;
+
 import org.imsglobal.lti.BasicLTIConstants;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
@@ -70,7 +70,7 @@
      * pages
      */
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException,
 	    RepositoryCheckedException, UserInfoFetchException, UserInfoValidationException {
 	initServices();
 	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
@@ -120,7 +120,7 @@
      * design and start a lesson.
      */
     public ActionForward addLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException,
 	    RepositoryCheckedException, UserInfoFetchException, UserInfoValidationException {
 	initServices();
 	Integer userId = getUser().getUserID();
@@ -156,7 +156,7 @@
      * Starts a lesson. Then prompts to learnerMonitor page.
      */
     public ActionForward startLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException,
 	    RepositoryCheckedException, UserInfoValidationException, UserInfoFetchException {
 	initServices();
 	Integer userId = getUser().getUserID();
@@ -211,7 +211,7 @@
      * Once lesson was created, start showing learnerMonitor page to everybody regardless of his role.
      */
     public ActionForward learnerMonitor(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException,
 	    RepositoryCheckedException, UserInfoValidationException, UserInfoFetchException {
 	initServices();
 	Integer userId = getUser().getUserID();
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -ra4fd7ba340a2beac7436660039f13b9c8708f172 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision a4fd7ba340a2beac7436660039f13b9c8708f172)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -14,7 +14,7 @@
  	<!-- Hibernate SessionFactory. Since LAMS 2.3 it is used in all tools and other parts of LAMS,
  		 rather than several local Session Factiories.
  	-->
-	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="dataSource"/></property>
 		<property name="mappingLocations">
 			<list>
Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java
===================================================================
diff -u -r58de3acfcde3052a939146df7d0172599e56633a -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java	(.../IRatingService.java)	(revision 58de3acfcde3052a939146df7d0172599e56633a)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java	(.../IRatingService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,8 +21,6 @@
  * ****************************************************************
  */
 
-
-
 package org.lamsfoundation.lams.rating.service;
 
 import java.util.Collection;
@@ -31,8 +29,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
 import org.lamsfoundation.lams.rating.RatingException;
 import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
@@ -41,16 +37,20 @@
 import org.lamsfoundation.lams.rating.model.Rating;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
 public interface IRatingService {
 
     void saveOrUpdateRating(Rating rating);
-    
-    /** 
+
+    /**
      * Save a group of ratings as the new ratings for this criteria, marking any existing ratings NULL.
      * Returns the number of "real" ratings, which should be newRatings.size.
+     * 
      * @return
      */
-    public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Map<Long, Float> newRatings);
+    public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId,
+	    Map<Long, Float> newRatings);
 
     /**
      * Read modified rating criterias from request, then update existing ones/add new ones/delete removed ones. Used on
@@ -64,19 +64,24 @@
     void saveRatingCriterias(HttpServletRequest request, Collection<RatingCriteria> oldCriterias, Long toolContentId);
 
     /**
-     * Save an already set up rating criteria. Only used when there will only ever be one anonymous criteria, like in Share Resources
+     * Save an already set up rating criteria. Only used when there will only ever be one anonymous criteria, like in
+     * Share Resources
+     * 
      * @param criteria
      * @return
      */
-    LearnerItemRatingCriteria saveLearnerItemRatingCriteria(Long toolContentId, String title, Integer orderId, int ratingStyle, boolean withComments, int minWordsInComment) throws RatingException;
-    
-    /** 
-     * Delete all the rating criteria linked to a tool content. This allows you to delete criteria created with saveToolStarRatingCriteria
+    LearnerItemRatingCriteria saveLearnerItemRatingCriteria(Long toolContentId, String title, Integer orderId,
+	    int ratingStyle, boolean withComments, int minWordsInComment) throws RatingException;
+
+    /**
+     * Delete all the rating criteria linked to a tool content. This allows you to delete criteria created with
+     * saveToolStarRatingCriteria
+     * 
      * @param toolContentId
      * @return
      */
     public int deleteAllRatingCriterias(Long toolContentId);
-    
+
     List<RatingCriteria> getCriteriasByToolContentId(Long toolContentId);
 
     RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId);
@@ -117,7 +122,8 @@
      */
     List<Rating> getRatingsByItem(Long itemId);
 
-    ItemRatingCriteriaDTO rateItem(RatingCriteria criteria, Long toolSessionId, Integer userId, Long itemId, float ratingFloat);
+    ItemRatingCriteriaDTO rateItem(RatingCriteria criteria, Long toolSessionId, Integer userId, Long itemId,
+	    float ratingFloat);
 
     void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId, String comment);
 
@@ -136,27 +142,35 @@
 	    boolean isCommentsByOtherUsersRequired, Long userId);
 
     /**
-     *  Used by tools to get the ratings and comments relating to their items. To be used within SQL and supply the toolContentId as :toolContentId, 
-     *  criteria id as :ratingCriteriaId and current user id as :userId
-     *  If getByUser == true then returns data for all users, as left by the current user, otherwise gives the data for the current user as left by other users
-     *  See Peer Review for example usage.
+     * Used by tools to get the ratings and comments relating to their items. To be used within SQL and supply the
+     * toolContentId as :toolContentId,
+     * criteria id as :ratingCriteriaId and current user id as :userId
+     * If getByUser == true then returns data for all users, as left by the current user, otherwise gives the data for
+     * the current user as left by other users
+     * See Peer Review for example usage.
      */
     String getRatingSelectJoinSQL(Integer ratingStyle, boolean getByUser);
-    
-    /** 
-     * Convert the raw data from the database to StyledCriteriaRatingDTO and StyleRatingDTO. The rating service expects its own fields
-     * to be first in each Object array, and the last item in the array to be an item description (eg formatted user's name)
+
+    /**
+     * Convert the raw data from the database to StyledCriteriaRatingDTO and StyleRatingDTO. The rating service expects
+     * its own fields
+     * to be first in each Object array, and the last item in the array to be an item description (eg formatted user's
+     * name)
      * Will go back to the database for the justification comment that would apply to hedging.
      */
-    StyledCriteriaRatingDTO convertToStyledDTO(RatingCriteria ratingCriteria, Long currentUser, boolean includeCurrentUser, List<Object[]> rawDataRows);
+    StyledCriteriaRatingDTO convertToStyledDTO(RatingCriteria ratingCriteria, Long currentUser,
+	    boolean includeCurrentUser, List<Object[]> rawDataRows);
 
-    /** 
-     * Convert the raw data from the database to JSON rows similar to StyleRatingDTO. The rating service expects its own fields
-     * to be first in each Object array, and the last item in the array to be an item description (eg formatted user's name)
+    /**
+     * Convert the raw data from the database to JSON rows similar to StyleRatingDTO. The rating service expects its own
+     * fields
+     * to be first in each Object array, and the last item in the array to be an item description (eg formatted user's
+     * name)
      * Will go back to the database for the justification comment that would apply to hedging.
      */
-    JSONArray convertToStyledJSON(RatingCriteria ratingCriteria, Long toolSessionId, Long currentUserId, boolean includeCurrentUser, 
-	    List<Object[]> rawDataRows, boolean needRatesPerUser) throws JSONException;
+    ArrayNode convertToStyledJSON(RatingCriteria ratingCriteria, Long toolSessionId, Long currentUserId,
+	    boolean includeCurrentUser, List<Object[]> rawDataRows, boolean needRatesPerUser);
+
     /**
      * Returns number of images rated by specified user in a current activity. It counts comments as ratings. This
      * method is applicable only for RatingCriterias of LEARNER_ITEM_CRITERIA_TYPE type.
@@ -168,15 +182,17 @@
     int getCountItemsRatedByUser(final Long toolContentId, final Integer userId);
 
     /**
-     * Returns number of items rated by specified user in a current activity, for a particular criteria. It counts comments as ratings
-     * iff it is a comment rating. This method is applicable only for RatingCriterias of LEARNER_ITEM_CRITERIA_TYPE type.
+     * Returns number of items rated by specified user in a current activity, for a particular criteria. It counts
+     * comments as ratings
+     * iff it is a comment rating. This method is applicable only for RatingCriterias of LEARNER_ITEM_CRITERIA_TYPE
+     * type.
      *
      * @param toolContentId
      * @param userId
      * @return
      */
     int getCountItemsRatedByUserByCriteria(final Long criteriaId, final Integer userId);
-    
+
     /**
      * Removes all ratings and comments left by the specified user.
      * 
@@ -185,21 +201,22 @@
      * @return
      */
     void removeUserCommitsByContent(final Long contentId, final Integer userId);
-    
+
     /**
-     * Count how many users rated and commented each item, limiting them to a single session if toolSessionId is not null
+     * Count how many users rated and commented each item, limiting them to a single session if toolSessionId is not
+     * null
      * Used only if the tool's request it.
      *
      * @param contentId
      * @param itemIds
      * @param excludeUserId
      * @return
      */
-    Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Long toolSessionId, final Collection<Long> itemIds,
-	    Integer excludeUserId);
-    
-    Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Long toolSessionId, final Collection<Long> itemIds,
-	    Integer excludeUserId);
+    Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Long toolSessionId,
+	    final Collection<Long> itemIds, Integer excludeUserId);
+
+    Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Long toolSessionId,
+	    final Collection<Long> itemIds, Integer excludeUserId);
     /** 
      * Get all the raw ratings for a combination of criteria and item ids. Used by Peer Review to do SPA analysis.
      */
Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
===================================================================
diff -u -r58de3acfcde3052a939146df7d0172599e56633a -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(.../RatingService.java)	(revision 58de3acfcde3052a939146df7d0172599e56633a)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(.../RatingService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,8 +21,6 @@
  * ****************************************************************
  */
 
-
-
 package org.lamsfoundation.lams.rating.service;
 
 import java.math.BigInteger;
@@ -39,9 +37,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.rating.RatingException;
 import org.lamsfoundation.lams.rating.dao.IRatingCommentDAO;
 import org.lamsfoundation.lams.rating.dao.IRatingCriteriaDAO;
@@ -57,9 +52,15 @@
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 public class RatingService implements IRatingService {
 
     private static Logger log = Logger.getLogger(RatingService.class);
@@ -93,29 +94,29 @@
     public int getCountItemsRatedByUserByCriteria(final Long criteriaId, final Integer userId) {
 	return ratingDAO.getCountItemsRatedByUserByCriteria(criteriaId, userId);
     }
-    
+
     @Override
     public void removeUserCommitsByContent(final Long contentId, final Integer userId) {
 	List<Rating> ratings = ratingDAO.getRatingsByUser(contentId, userId);
 	for (Rating rating : ratings) {
 	    ratingDAO.delete(rating);
 	}
-	
+
 	List<RatingComment> comments = ratingCommentDAO.getCommentsByContentAndUser(contentId, userId);
 	for (RatingComment comment : comments) {
 	    ratingDAO.delete(comment);
 	}
     }
-    
+
     @Override
-    public Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Long toolSessionId, final Collection<Long> itemIds,
-	    Integer excludeUserId) {
+    public Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Long toolSessionId,
+	    final Collection<Long> itemIds, Integer excludeUserId) {
 	return ratingDAO.countUsersRatedEachItem(contentId, toolSessionId, itemIds, excludeUserId);
     }
 
     @Override
-    public Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Long toolSessionId, final Collection<Long> itemIds,
-	    Integer excludeUserId) {
+    public Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Long toolSessionId,
+	    final Collection<Long> itemIds, Integer excludeUserId) {
 	return ratingDAO.countUsersRatedEachItemByCriteria(criteriaId, toolSessionId, itemIds, excludeUserId);
     }
 
@@ -125,8 +126,8 @@
     }
 
     @Override
-    public ItemRatingCriteriaDTO rateItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId,
-	    float ratingFloat) {
+    public ItemRatingCriteriaDTO rateItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId,
+	    Long itemId, float ratingFloat) {
 
 	Long ratingCriteriaId = ratingCriteria.getRatingCriteriaId();
 	Rating rating = ratingDAO.getRating(ratingCriteriaId, userId, itemId);
@@ -151,25 +152,26 @@
     }
 
     @Override
-    public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Map<Long, Float> newRatings) {
+    public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId,
+	    Map<Long, Float> newRatings) {
 
 	User learner = (User) userManagementService.findById(User.class, userId);
 	int numRatings = 0;
-	
+
 	List<Rating> dbRatings = ratingDAO.getRatingsByUserCriteria(ratingCriteria.getRatingCriteriaId(), userId);
-	for ( Rating rating: dbRatings ) {
+	for (Rating rating : dbRatings) {
 	    Long itemId = rating.getItemId();
 	    Float newRating = newRatings.get(itemId);
-	    if ( newRating != null ) {
+	    if (newRating != null) {
 		rating.setRating(newRating);
 		newRatings.remove(itemId);
 		numRatings++;
 		ratingDAO.saveOrUpdate(rating);
 	    } else {
-		rating.setRating((Float)null);
+		rating.setRating((Float) null);
 	    }
 	}
-	for ( Map.Entry<Long, Float> entry : newRatings.entrySet() ) {
+	for (Map.Entry<Long, Float> entry : newRatings.entrySet()) {
 	    Rating rating = new Rating();
 	    rating.setItemId(entry.getKey());
 	    rating.setLearner(learner);
@@ -179,12 +181,13 @@
 	    ratingDAO.saveOrUpdate(rating);
 	    numRatings++;
 	}
-	    
+
 	return numRatings;
     }
-    
+
     @Override
-    public void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId, String comment) {
+    public void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId,
+	    String comment) {
 	RatingComment ratingComment = ratingCommentDAO.getComment(ratingCriteria.getRatingCriteriaId(), userId, itemId);
 
 	// persist MessageRating changes in DB
@@ -208,8 +211,8 @@
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
 
 	// fail safe - if there are no items, don't try to look anything up! LDEV-4094
-	if ( itemIds == null || itemIds.isEmpty() ) {
-	    return new LinkedList<ItemRatingDTO>();
+	if (itemIds == null || itemIds.isEmpty()) {
+	    return new LinkedList<>();
 	}
 
 	//initial preparations
@@ -220,8 +223,8 @@
 	Long singleItemId = isSingleItem ? itemIds.iterator().next() : null;
 
 	//handle comments criteria
-	List<ItemRatingDTO> itemDtos = handleCommentsCriteria(criterias, toolSessionId, itemIds, isCommentsByOtherUsersRequired,
-		userId);
+	List<ItemRatingDTO> itemDtos = handleCommentsCriteria(criterias, toolSessionId, itemIds,
+		isCommentsByOtherUsersRequired, userId);
 
 	//get all data from DB
 	List<Rating> userRatings = ratingDAO.getRatingsByUser(contentId, userId.intValue());
@@ -237,7 +240,7 @@
 	//handle all criterias except for comments' one
 	for (ItemRatingDTO itemDto : itemDtos) {
 	    Long itemId = itemDto.getItemId();
-	    List<ItemRatingCriteriaDTO> criteriaDtos = new LinkedList<ItemRatingCriteriaDTO>();
+	    List<ItemRatingCriteriaDTO> criteriaDtos = new LinkedList<>();
 	    itemDto.setCriteriaDtos(criteriaDtos);
 
 	    for (RatingCriteria criteria : criterias) {
@@ -273,7 +276,7 @@
 		    }
 		}
 
-		if ( itemStatistics != null ) {
+		if (itemStatistics != null) {
 		    Number averageRating = (Number) itemStatistics[2];
 		    criteriaDto.setAverageRating(numberFormat.format(averageRating));
 		    criteriaDto.setAverageRatingAsNumber(averageRating);
@@ -296,8 +299,8 @@
     /*
      * Fetches all required comments from the DB.
      */
-    private List<ItemRatingDTO> handleCommentsCriteria(List<RatingCriteria> criterias, Long toolSessionId, Collection<Long> itemIds,
-	    boolean isCommentsByOtherUsersRequired, Long userId) {
+    private List<ItemRatingDTO> handleCommentsCriteria(List<RatingCriteria> criterias, Long toolSessionId,
+	    Collection<Long> itemIds, boolean isCommentsByOtherUsersRequired, Long userId) {
 
 	boolean isSingleItem = itemIds.size() == 1;
 	Long singleItemId = isSingleItem ? itemIds.iterator().next() : null;
@@ -311,11 +314,13 @@
 
 		List<RatingCommentDTO> commentDtos;
 		if (isSingleItem) {
-		    commentDtos = ratingCommentDAO.getCommentsByCriteriaAndItem(commentCriteriaId, toolSessionId, singleItemId);
+		    commentDtos = ratingCommentDAO.getCommentsByCriteriaAndItem(commentCriteriaId, toolSessionId,
+			    singleItemId);
 
 		    //query DB using itemIds
 		} else if (isCommentsByOtherUsersRequired) {
-		    commentDtos = ratingCommentDAO.getCommentsByCriteriaAndItems(commentCriteriaId, toolSessionId, itemIds);
+		    commentDtos = ratingCommentDAO.getCommentsByCriteriaAndItems(commentCriteriaId, toolSessionId,
+			    itemIds);
 
 		    // get only comments done by the specified user
 		} else {
@@ -329,7 +334,7 @@
 		    itemDto.setCommentsMinWordsLimit(criteria.getCommentsMinWordsLimit());
 
 		    //assign commentDtos by the appropriate items
-		    List<RatingCommentDTO> commentDtosPerItem = new LinkedList<RatingCommentDTO>();
+		    List<RatingCommentDTO> commentDtosPerItem = new LinkedList<>();
 		    for (RatingCommentDTO commentDto : commentDtos) {
 			if (commentDto.getItemId().equals(itemDto.getItemId())) {
 			    commentDtosPerItem.add(commentDto);
@@ -353,7 +358,7 @@
 
     private List<ItemRatingDTO> initializeItemDtos(Collection<Long> itemIds) {
 	// initialize itemDtos
-	List<ItemRatingDTO> itemDtos = new LinkedList<ItemRatingDTO>();
+	List<ItemRatingDTO> itemDtos = new LinkedList<>();
 	for (Long itemId : itemIds) {
 	    ItemRatingDTO itemDto = new ItemRatingDTO();
 	    itemDto.setItemId(itemId);
@@ -379,9 +384,10 @@
 	return ratingCriteriaDAO.getByRatingCriteriaId(ratingCriteriaId, clasz);
     }
 
-    
-    private LearnerItemRatingCriteria updateLearnerItemRatingCriteria(LearnerItemRatingCriteria oldCriteria, Long toolContentId, String title, Integer orderId, int ratingStyle, boolean withComments, int minWordsInComment){
-	
+    private LearnerItemRatingCriteria updateLearnerItemRatingCriteria(LearnerItemRatingCriteria oldCriteria,
+	    Long toolContentId, String title, Integer orderId, int ratingStyle, boolean withComments,
+	    int minWordsInComment) {
+
 	LearnerItemRatingCriteria criteria = oldCriteria != null ? oldCriteria : new LearnerItemRatingCriteria();
 	criteria.setRatingCriteriaTypeId(RatingCriteria.LEARNER_ITEM_CRITERIA_TYPE);
 	criteria.setToolContentId(toolContentId);
@@ -392,7 +398,7 @@
 	criteria.setCommentsMinWordsLimit(minWordsInComment);
 	criteria.setMinimumRates(null);
 	criteria.setMaximumRates(null);
-	
+
 	Integer maxRating = null;
 	switch (ratingStyle) {
 	    case RatingCriteria.RATING_STYLE_STAR:
@@ -409,28 +415,30 @@
 	criteria.setMaxRating(maxRating);
 	return criteria;
     }
-    
+
     @Override
-    public LearnerItemRatingCriteria saveLearnerItemRatingCriteria(Long toolContentId, String title, Integer orderId, int ratingStyle, boolean withComments, int minWordsInComment) throws RatingException {
+    public LearnerItemRatingCriteria saveLearnerItemRatingCriteria(Long toolContentId, String title, Integer orderId,
+	    int ratingStyle, boolean withComments, int minWordsInComment) throws RatingException {
 	List<RatingCriteria> criterias = ratingCriteriaDAO.getByToolContentId(toolContentId);
 	LearnerItemRatingCriteria criteria = null;
-	if ( criterias.size() > 0 ) {
-	    for ( RatingCriteria c : criterias ) {
-		if ( c.getOrderId().equals(orderId) )
-		    if ( ! c.isLearnerItemRatingCriteria() ) {
-			String msg = new StringBuilder("Wrong type of criteria found - needs to be a AuthoredItemRatingCriteria for toolContentId ")
-					.append(toolContentId)
-					.append("criteriaId ")
-					.append(c.getRatingCriteriaId())
+	if (criterias.size() > 0) {
+	    for (RatingCriteria c : criterias) {
+		if (c.getOrderId().equals(orderId)) {
+		    if (!c.isLearnerItemRatingCriteria()) {
+			String msg = new StringBuilder(
+				"Wrong type of criteria found - needs to be a AuthoredItemRatingCriteria for toolContentId ")
+					.append(toolContentId).append("criteriaId ").append(c.getRatingCriteriaId())
 					.toString();
 			log.error(msg);
 			throw new RatingException(msg);
 		    }
-		criteria = (LearnerItemRatingCriteria)c;
+		}
+		criteria = (LearnerItemRatingCriteria) c;
 		break;
 	    }
-	} 
-	criteria = updateLearnerItemRatingCriteria(criteria, toolContentId, title, orderId, ratingStyle, withComments, minWordsInComment);
+	}
+	criteria = updateLearnerItemRatingCriteria(criteria, toolContentId, title, orderId, ratingStyle, withComments,
+		minWordsInComment);
 	ratingCriteriaDAO.saveOrUpdate(criteria);
 	return criteria;
     }
@@ -439,7 +447,7 @@
     public int deleteAllRatingCriterias(Long toolContentId) {
 	List<RatingCriteria> criterias = ratingCriteriaDAO.getByToolContentId(toolContentId);
 	int count = 0;
-	for ( RatingCriteria criteria : criterias ) {
+	for (RatingCriteria criteria : criterias) {
 	    ratingCriteriaDAO.deleteRatingCriteria(criteria.getRatingCriteriaId());
 	    count++;
 	}
@@ -449,31 +457,32 @@
     @Override
     public void saveRatingCriterias(HttpServletRequest request, Collection<RatingCriteria> oldCriterias,
 	    Long toolContentId) {
-	
+
 	// different handling for comments - simple tag sets the isCommentsEnabled flag,
 	// the complex tag sends explicit comment type entry.
 	boolean explicitCommentTypeFound = false;
-	
+
 	// create orderId to RatingCriteria map
-	Map<Integer, RatingCriteria> mapOrderIdToRatingCriteria = new HashMap<Integer, RatingCriteria>();
+	Map<Integer, RatingCriteria> mapOrderIdToRatingCriteria = new HashMap<>();
 	for (RatingCriteria ratingCriteriaIter : oldCriterias) {
 	    mapOrderIdToRatingCriteria.put(ratingCriteriaIter.getOrderId(), ratingCriteriaIter);
 	}
-	
+
 //	for ( Map.Entry entry : request.getParameterMap().entrySet()) {
 //	    log.debug("entry: "+entry.getKey()+" "+entry.getValue());
 //	}
-	
+
 	int criteriaMaxOrderId = WebUtil.readIntParam(request, "criteriaMaxOrderId");
 	// i is equal to an old orderId
 	for (int i = 1; i <= criteriaMaxOrderId; i++) {
 
 	    String criteriaTitle = WebUtil.readStrParam(request, "criteriaTitle" + i, true);
 
-	    Integer ratingStyle = WebUtil.readIntParam(request,  "ratingStyle" + i, true);
-	    if ( ratingStyle == null )
+	    Integer ratingStyle = WebUtil.readIntParam(request, "ratingStyle" + i, true);
+	    if (ratingStyle == null) {
 		ratingStyle = RatingCriteria.RATING_STYLE_STAR;
-	    
+	    }
+
 	    Integer maxRating = WebUtil.readIntParam(request, "maxRating" + i, true);
 	    if (maxRating == null) {
 		switch (ratingStyle) {
@@ -492,19 +501,21 @@
 
 	    Integer minRatings = 0;
 	    Integer maxRatings = 0;
-	    if ( ratingStyle == RatingCriteria.RATING_STYLE_STAR || ratingStyle == RatingCriteria.RATING_STYLE_COMMENT ) {
+	    if (ratingStyle == RatingCriteria.RATING_STYLE_STAR || ratingStyle == RatingCriteria.RATING_STYLE_COMMENT) {
 		minRatings = WebUtil.readIntParam(request, "minimumRates" + i, true);
 		maxRatings = WebUtil.readIntParam(request, "maximumRates" + i, true);
-	    } 
-	    
+	    }
 
-	    boolean commentsEnabled = ( ratingStyle != RatingCriteria.RATING_STYLE_COMMENT ? WebUtil.readBooleanParam(request,  "enableComments" + i, false) : true );
-	    
+	    boolean commentsEnabled = (ratingStyle != RatingCriteria.RATING_STYLE_COMMENT
+		    ? WebUtil.readBooleanParam(request, "enableComments" + i, false)
+		    : true);
+
 	    RatingCriteria ratingCriteria = mapOrderIdToRatingCriteria.get(i);
-	    if ( ratingStyle == RatingCriteria.RATING_STYLE_COMMENT || (ratingCriteria != null && ratingCriteria.isCommentRating()) ) {
+	    if (ratingStyle == RatingCriteria.RATING_STYLE_COMMENT
+		    || (ratingCriteria != null && ratingCriteria.isCommentRating())) {
 		explicitCommentTypeFound = true;
 	    }
-	    
+
 	    if (StringUtils.isNotBlank(criteriaTitle)) {
 		int newCriteriaOrderId = WebUtil.readIntParam(request, "criteriaOrderId" + i);
 
@@ -520,17 +531,17 @@
 		ratingCriteria.setRatingStyle(ratingStyle);
 		ratingCriteria.setMaxRating(maxRating);
 		ratingCriteria.setCommentsEnabled(commentsEnabled);
-		if ( commentsEnabled ) {
+		if (commentsEnabled) {
 		    Integer commentsMinWordsLimit = WebUtil.readIntParam(request, "commentsMinWordsLimit" + i, true);
 		    ratingCriteria.setCommentsMinWordsLimit(commentsMinWordsLimit != null ? commentsMinWordsLimit : 0);
 		} else {
 		    ratingCriteria.setCommentsMinWordsLimit(0);
 		}
 
-		ratingCriteria.setMinimumRates( minRatings );
-		ratingCriteria.setMaximumRates( maxRatings );
-		
-    		ratingCriteriaDAO.saveOrUpdate(ratingCriteria);
+		ratingCriteria.setMinimumRates(minRatings);
+		ratingCriteria.setMaximumRates(maxRatings);
+
+		ratingCriteriaDAO.saveOrUpdate(ratingCriteria);
 		// !!updatedCriterias.add(ratingCriteria);
 
 		// delete
@@ -541,7 +552,7 @@
 	}
 
 	// ==== handle comments criteria - simple tag support ====
-	if ( ! explicitCommentTypeFound ) {
+	if (!explicitCommentTypeFound) {
 	    boolean isCommentsEnabled = WebUtil.readBooleanParam(request, "isCommentsEnabled", false);
 
 	    // find comments' responsible RatingCriteria
@@ -581,76 +592,79 @@
      * Convert the raw data from the database to StyledCriteriaRatingDTO and StyleRatingDTO. The rating service expects
      * the potential itemId followed by rating.* (its own fields) and the last item in the array to be an item
      * description (eg formatted user's name) Will go back to the database for the justification comment that would
-     * apply to hedging. 
-     * 
+     * apply to hedging.
+     *
      * If includeCurrentUser == true will include the current users' records (used for SelfReview and Monitoring)
      * otherwise skips the current user, so they do not rate themselves!
-     * 
-     * Entries in Object array for comment style: 
-     *   tool item id (usually user id), rating.item_id, rating_comment.comment, (tool fields)+
-     * Entries in Object array for other styles: 
-     *   tool item id (usually user id), rating.item_id, rating_comment.comment,
-     *   rating.rating, calculated.average_rating, calculated.count_vote, (tool fields)+
+     *
+     * Entries in Object array for comment style:
+     * tool item id (usually user id), rating.item_id, rating_comment.comment, (tool fields)+
+     * Entries in Object array for other styles:
+     * tool item id (usually user id), rating.item_id, rating_comment.comment,
+     * rating.rating, calculated.average_rating, calculated.count_vote, (tool fields)+
      */
     @Override
-    public StyledCriteriaRatingDTO convertToStyledDTO(RatingCriteria ratingCriteria, Long currentUserId, boolean includeCurrentUser, 
-	    List<Object[]> rawDataRows) {
+    public StyledCriteriaRatingDTO convertToStyledDTO(RatingCriteria ratingCriteria, Long currentUserId,
+	    boolean includeCurrentUser, List<Object[]> rawDataRows) {
 
 	StyledCriteriaRatingDTO criteriaDto = new StyledCriteriaRatingDTO();
 	criteriaDto.setRatingCriteria(ratingCriteria);
 
-	if (ratingCriteria.isHedgeStyleRating() && ratingCriteria.isCommentsEnabled() ) {
+	if (ratingCriteria.isHedgeStyleRating() && ratingCriteria.isCommentsEnabled()) {
 	    RatingComment justification = ratingCommentDAO.getComment(ratingCriteria.getRatingCriteriaId(),
 		    currentUserId.intValue(), ratingCriteria.getRatingCriteriaId());
-	    if (justification != null)
+	    if (justification != null) {
 		criteriaDto.setJustificationComment(justification.getComment());
-	} else if ( ratingCriteria.isStarStyleRating() ) {
-	    int ratedCount = getCountItemsRatedByUserByCriteria(ratingCriteria.getRatingCriteriaId(), currentUserId.intValue());
+	    }
+	} else if (ratingCriteria.isStarStyleRating()) {
+	    int ratedCount = getCountItemsRatedByUserByCriteria(ratingCriteria.getRatingCriteriaId(),
+		    currentUserId.intValue());
 	    criteriaDto.setCountRatedItems(ratedCount);
 	}
 
 	boolean isComment = ratingCriteria.isCommentRating();
-	if ( rawDataRows != null ) {
+	if (rawDataRows != null) {
 
-	    List<StyledRatingDTO> ratingDtos = new ArrayList<StyledRatingDTO>();
+	    List<StyledRatingDTO> ratingDtos = new ArrayList<>();
 	    criteriaDto.setRatingDtos(ratingDtos);
 
-
 	    NumberFormat numberFormat = NumberFormat.getInstance(Locale.US);
 	    numberFormat.setMaximumFractionDigits(1);
 
 	    for (Object[] row : rawDataRows) {
 		int numColumns = row.length;
-		if ( ( isComment && numColumns < 4 ) || ( !isComment && numColumns < 7) ) {
+		if ((isComment && numColumns < 4) || (!isComment && numColumns < 7)) {
 		    StringBuffer buf = new StringBuffer("convertToStyledDTO: ratingCriteria")
 			    .append(ratingCriteria.getRatingCriteriaId()).append(" UserId: ").append(currentUserId)
 			    .append("  Skipping data row as there are not enough columns. Only ").append(numColumns)
 			    .append(" columns. numColumns: ").append(numColumns);
-		    if (numColumns > 0)
+		    if (numColumns > 0) {
 			buf.append(" Data: 0:").append(row[0]);
-		    if (numColumns > 1)
+		    }
+		    if (numColumns > 1) {
 			buf.append(" 1:").append(row[1]);
+		    }
 		    log.error(buf.toString());
 		    break;
 		}
 
 		long itemId = ((BigInteger) row[0]).longValue();
-		if ( includeCurrentUser || itemId != currentUserId) {
+		if (includeCurrentUser || itemId != currentUserId) {
 
-		    if (row[1] != null && itemId != ((BigInteger) row[0]).longValue() ) {
-			log.error("convertToStyledDTO: ratingCriteria" + ratingCriteria.getRatingCriteriaId() + " UserId: "
-				+ currentUserId + "  Potential issue: expected item id " + row[0] + " does match real item id "
-				+ row[1] + ". Data: 0:" + row[0] + " 1:" + row[1]);
+		    if (row[1] != null && itemId != ((BigInteger) row[0]).longValue()) {
+			log.error("convertToStyledDTO: ratingCriteria" + ratingCriteria.getRatingCriteriaId()
+				+ " UserId: " + currentUserId + "  Potential issue: expected item id " + row[0]
+				+ " does match real item id " + row[1] + ". Data: 0:" + row[0] + " 1:" + row[1]);
 		    }
-		    
+
 		    StyledRatingDTO dto = new StyledRatingDTO(((BigInteger) row[0]).longValue());
 		    dto.setComment((String) row[2]);
 		    dto.setItemDescription( row[numColumns - 2] != null ? row[numColumns - 2].toString() : null);
 		    dto.setItemDescription2( row[numColumns - 1] != null ? row[numColumns - 1].toString() : null);
-		    if ( ! isComment ) {
-			dto.setUserRating(row[3] == null ? "" : numberFormat.format((Double) row[3]));
-			dto.setAverageRating(row[4] == null ? "" : numberFormat.format((Double) row[4]));
-			dto.setNumberOfVotes(row[5] == null ? "" : numberFormat.format((BigInteger) row[5]));
+		    if (!isComment) {
+			dto.setUserRating(row[3] == null ? "" : numberFormat.format(row[3]));
+			dto.setAverageRating(row[4] == null ? "" : numberFormat.format(row[4]));
+			dto.setNumberOfVotes(row[5] == null ? "" : numberFormat.format(row[5]));
 		    }
 		    ratingDtos.add(dto);
 		}
@@ -661,96 +675,100 @@
     }
 
     /**
-     * Convert the raw data from the database to JSON, similar on StyledCriteriaRatingDTO and StyleRatingDTO. 
+     * Convert the raw data from the database to JSON, similar on StyledCriteriaRatingDTO and StyleRatingDTO.
      * The rating service expects the potential itemId followed by rating.* (its own fields) and the last two items 
      * in the array will be two item descriptions fields (eg formatted user's name, portrait id). Will go back to 
      * the database for the justification comment that would apply to hedging. 
      * 
      * If includeCurrentUser == true will include the current users' records (used for SelfReview and Monitoring)
      * otherwise skips the current user, so they do not rate themselves!
-     * 
+     *
      * toolSessionId is only used to calculate the number of users who have rated an item, so it may be null
      * if the tool doesn't need to seperate session (Peer Review doesn't need to separate by sessions).
-     * 
+     *
      * In JSON for use with tablesorter.
-     * Entries in Object array for comment style: 
-     *   tool item id (usually user id), rating.item_id, rating_comment.comment, (tool fields)+
-     * Entries in Object array for other styles: 
-     *   tool item id (usually user id), rating.item_id, rating_comment.comment,
-     *   rating.rating, calculated.average_rating, calculated.count_vote, (tool fields)+
-     * @throws JSONException 
+     * Entries in Object array for comment style:
+     * tool item id (usually user id), rating.item_id, rating_comment.comment, (tool fields)+
+     * Entries in Object array for other styles:
+     * tool item id (usually user id), rating.item_id, rating_comment.comment,
+     * rating.rating, calculated.average_rating, calculated.count_vote, (tool fields)+
+     *
+     * @throws JSONException
      */
     @Override
-    public JSONArray convertToStyledJSON(RatingCriteria ratingCriteria, Long toolSessionId, Long currentUserId, boolean includeCurrentUser, 
-	    List<Object[]> rawDataRows, boolean needRatesPerUser) throws JSONException {
+    public ArrayNode convertToStyledJSON(RatingCriteria ratingCriteria, Long toolSessionId, Long currentUserId,
+	    boolean includeCurrentUser, List<Object[]> rawDataRows, boolean needRatesPerUser) {
 
-	JSONArray rows = new JSONArray();
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
 	boolean isComment = ratingCriteria.isCommentRating();
 
-	if ( rawDataRows != null ) {
+	if (rawDataRows != null) {
 
-	    List<Long> itemIds = needRatesPerUser ? new ArrayList<Long>(rawDataRows.size()) : null;
+	    List<Long> itemIds = needRatesPerUser ? new ArrayList<>(rawDataRows.size()) : null;
 
 	    NumberFormat numberFormat = NumberFormat.getInstance(Locale.US);
 	    numberFormat.setMaximumFractionDigits(1);
 
 	    for (Object[] row : rawDataRows) {
 		int numColumns = row.length;
-		if ( ( isComment && numColumns < 4 ) || ( !isComment && numColumns < 7) ) {
+		if ((isComment && numColumns < 4) || (!isComment && numColumns < 7)) {
 		    StringBuffer buf = new StringBuffer("convertToStyledJSON: ratingCriteria")
 			    .append(ratingCriteria.getRatingCriteriaId()).append(" UserId: ").append(currentUserId)
 			    .append("  Skipping data row as there are not enough columns. Only ").append(numColumns)
 			    .append(" columns. numColumns: ").append(numColumns);
-		    if (numColumns > 0)
+		    if (numColumns > 0) {
 			buf.append(" Data: 0:").append(row[0]);
-		    if (numColumns > 1)
+		    }
+		    if (numColumns > 1) {
 			buf.append(" 1:").append(row[1]);
+		    }
 		    log.error(buf.toString());
 		    break;
 		}
-		
+
 		Long itemId = ((BigInteger) row[0]).longValue();
-		if ( includeCurrentUser || itemId != currentUserId) {
+		if (includeCurrentUser || itemId != currentUserId) {
 
-		    if (row[1] != null &&  itemId.longValue() != ((BigInteger) row[0]).longValue() ) {
-			log.error("convertToStyledJSON: ratingCriteria" + ratingCriteria.getRatingCriteriaId() + " UserId: "
-				+ currentUserId + "  Potential issue: expected item id " + row[0] + " does match real item id "
-				+ row[1] + ". Data: 0:" + row[0] + " 1:" + row[1]);
+		    if (row[1] != null && itemId.longValue() != ((BigInteger) row[0]).longValue()) {
+			log.error("convertToStyledJSON: ratingCriteria" + ratingCriteria.getRatingCriteriaId()
+				+ " UserId: " + currentUserId + "  Potential issue: expected item id " + row[0]
+				+ " does match real item id " + row[1] + ". Data: 0:" + row[0] + " 1:" + row[1]);
 		    }
-		    
-		    JSONObject userRow = new JSONObject();
+
+		    ObjectNode userRow = JsonNodeFactory.instance.objectNode();
 		    userRow.put("itemId", itemId);
 		    userRow.put("comment", row[2] == null ? "" : (String) row[2]);
     		    userRow.put("itemDescription", row[numColumns - 2] == null ? "" : row[numColumns - 2].toString());
     		    userRow.put("itemDescription2", row[numColumns - 1] == null ? "" : row[numColumns - 1].toString());
-		    if ( ! isComment ) {
-        		    userRow.put("userRating", row[3] == null ? "" : numberFormat.format((Double) row[3]));
-        		    userRow.put("averageRating",  row[4] == null ? "" : numberFormat.format((Double) row[4]));
-        		    userRow.put("numberOfVotes", row[5] == null ? "" : numberFormat.format((BigInteger) row[5]));
+		    if (!isComment) {
+			userRow.put("userRating", row[3] == null ? "" : numberFormat.format(row[3]));
+			userRow.put("averageRating", row[4] == null ? "" : numberFormat.format(row[4]));
+			userRow.put("numberOfVotes", row[5] == null ? "" : numberFormat.format(row[5]));
 		    } else {
 			// don't have missing entries in JSON or an exception can occur if you try to access them
-        		    userRow.put("userRating", "");
-        		    userRow.put("averageRating", "");
-        		    userRow.put("numberOfVotes", "");
+			userRow.put("userRating", "");
+			userRow.put("averageRating", "");
+			userRow.put("numberOfVotes", "");
 		    }
 
-		    rows.put(userRow);
-		    
-		    if ( needRatesPerUser )
+		    rows.add(userRow);
+
+		    if (needRatesPerUser) {
 			itemIds.add(itemId);
+		    }
 		}
 	    }
-	    
-	    if ( needRatesPerUser ) {
-		Map<Long, Long> countUsersRatedEachItemMap = ratingDAO.countUsersRatedEachItemByCriteria(ratingCriteria.getRatingCriteriaId(), toolSessionId, itemIds, -1);
-		for ( int i=0; i < rows.length(); i++ ) {
-		    JSONObject row = rows.getJSONObject(i);
-		    Long count = countUsersRatedEachItemMap.get(row.get("itemId"));
-		    row.put("ratesPerUser", count != null ? count : 0);
+
+	    if (needRatesPerUser) {
+		Map<Long, Long> countUsersRatedEachItemMap = ratingDAO.countUsersRatedEachItemByCriteria(
+			ratingCriteria.getRatingCriteriaId(), toolSessionId, itemIds, -1);
+		for (JsonNode row : rows) {
+		    Long count = countUsersRatedEachItemMap.get(JsonUtil.optLong(row, "itemId"));
+		    ((ObjectNode) row).put("ratesPerUser", count == null ? 0 : count);
 		}
 	    }
 	}
-	
+
 	return rows;
 
     }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
===================================================================
diff -u -re6b3b4b473ebb151c10733808c40d4276b4f81ab -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java	(.../GradebookAction.java)	(revision e6b3b4b473ebb151c10733808c40d4276b4f81ab)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java	(.../GradebookAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.gradebook.web.action;
 
 import java.util.ArrayList;
@@ -61,10 +60,14 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author lfoxton
  *
- * Handles the general requests for content in gradebook
+ *         Handles the general requests for content in gradebook
  */
 public class GradebookAction extends LamsDispatchAction {
 
@@ -110,7 +113,7 @@
 	String searchOper = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_OPERATION, true);
 	String searchString = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_STRING, true);
 	GBGridView view = GradebookUtil.readGBGridViewParam(request, GradebookConstants.PARAM_VIEW, false);
-	
+
 	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	if (!getSecurityService().isLessonParticipant(lessonID, getUser().getUserID(), "get activity gradebook data",
 		false)) {
@@ -134,9 +137,11 @@
 	// Get the user gradebook list from the db
 	// A slightly different list is needed for userview or activity view
 	if ((view == GBGridView.MON_USER) || (view == GBGridView.LRN_ACTIVITY)) {//2nd level && from personal marks page (2nd level or 1st)
-	    gradebookActivityDTOs = getGradebookService().getGBActivityRowsForLearner(lessonID, userID, currentUserDTO.getTimeZone());
+	    gradebookActivityDTOs = getGradebookService().getGBActivityRowsForLearner(lessonID, userID,
+		    currentUserDTO.getTimeZone());
 	} else if (view == GBGridView.MON_ACTIVITY) {
-	    gradebookActivityDTOs = getGradebookService().getGBActivityRowsForLesson(lessonID, currentUserDTO.getTimeZone());
+	    gradebookActivityDTOs = getGradebookService().getGBActivityRowsForLesson(lessonID,
+		    currentUserDTO.getTimeZone());
 	}
 
 	if ((sortBy == null) || sortBy.equals("")) {
@@ -150,6 +155,54 @@
 	return null;
     }
 
+    public ActionForward getLessonCompleteGridData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	// Getting the params passed in from the jqGrid
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+	UserDTO currentUserDTO = getUser();
+	Integer userId = currentUserDTO.getUserID();
+	if (!getSecurityService().isLessonParticipant(lessonId, userId, "get lesson complete gradebook data", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a learner in the lesson");
+	    return null;
+	}
+
+	List<GradebookGridRowDTO> gradebookActivityDTOs = getGradebookService().getGBLessonComplete(lessonId, userId);
+
+	ObjectNode resultJSON = JsonNodeFactory.instance.objectNode();
+	resultJSON.put(GradebookConstants.ELEMENT_RECORDS, gradebookActivityDTOs.size());
+
+	ArrayNode rowsJSON = JsonNodeFactory.instance.arrayNode();
+	for (GradebookGridRowDTO gradebookActivityDTO : gradebookActivityDTOs) {
+	    ObjectNode rowJSON = JsonNodeFactory.instance.objectNode();
+	    rowJSON.put(GradebookConstants.ELEMENT_ID, gradebookActivityDTO.getId());
+
+	    ArrayNode cellJSON = JsonNodeFactory.instance.arrayNode();
+	    cellJSON.add(gradebookActivityDTO.getRowName());
+	    cellJSON.add(gradebookActivityDTO.getStatus());
+	    cellJSON.add(gradebookActivityDTO.getAverageMark() == null ? GradebookConstants.CELL_EMPTY
+		    : GradebookUtil.niceFormatting(gradebookActivityDTO.getAverageMark()));
+	    cellJSON.add(gradebookActivityDTO.getMark() == null ? GradebookConstants.CELL_EMPTY
+		    : GradebookUtil.niceFormatting(gradebookActivityDTO.getMark()));
+
+	    rowJSON.set(GradebookConstants.ELEMENT_CELL, cellJSON);
+	    rowsJSON.add(rowJSON);
+	}
+	resultJSON.set(GradebookConstants.ELEMENT_ROWS, rowsJSON);
+
+	boolean isWeighted = getGradebookService().isWeightedMarks(lessonId);
+	GradebookUserLesson gradebookUserLesson = getGradebookService().getGradebookUserLesson(lessonId, userId);
+	resultJSON.put("learnerLessonMark",
+		gradebookUserLesson == null || gradebookUserLesson.getMark() == null ? GradebookConstants.CELL_EMPTY
+			: GradebookUtil.niceFormatting(gradebookUserLesson.getMark(), isWeighted));
+	Double averageLessonMark = getGradebookService().getAverageMarkForLesson(lessonId);
+	resultJSON.put("averageLessonMark", averageLessonMark == null ? GradebookConstants.CELL_EMPTY
+		: GradebookUtil.niceFormatting(averageLessonMark, isWeighted));
+
+	response.setContentType("application/json;charset=utf-8");
+	response.getWriter().print(resultJSON.toString());
+	return null;
+    }
+
     /**
      * Returns an xml representation of the user grid for gradebook
      *
@@ -180,7 +233,6 @@
 	String sortBy = WebUtil.readStrParam(request, GradebookConstants.PARAM_SIDX, true);
 	Boolean isSearch = WebUtil.readBooleanParam(request, GradebookConstants.PARAM_SEARCH);
 	String searchField = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_FIELD, true);
-	String searchOper = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_OPERATION, true);
 	String searchString = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_STRING, true);
 	GBGridView view = GradebookUtil.readGBGridViewParam(request, GradebookConstants.PARAM_VIEW, false);
 	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID, true);
@@ -191,7 +243,6 @@
 	// parameters
 	if (isSearch && (searchField == null)) {
 	    searchField = GradebookConstants.PARAM_ROW_NAME;
-	    searchOper = GradebookConstants.SEARCH_CONTAINS;
 	    searchString = WebUtil.readStrParam(request, GradebookConstants.PARAM_ROW_NAME, true);
 	}
 
@@ -252,7 +303,7 @@
 		}
 	    }
 
-	    // 2nd table of gradebook course monitor 
+	    // 2nd table of gradebook course monitor
 	    // if organisationID is specified (but not lessonID) then show results for organisation
 	} else if (organisationID != null) {
 	    if (!getSecurityService().isGroupMonitor(organisationID, user.getUserID(), "get gradebook", false)) {
@@ -511,7 +562,6 @@
 	    return null;
 	}
 
-	Lesson lesson = getLessonService().getLesson(lessonID);
 	Double averageMark = getGradebookService().getAverageMarkForLesson(lessonID);
 
 	if (averageMark != null) {
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
===================================================================
diff -u -r001b71e1b6da336c4adb6376c31ba95d4ace7b28 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(.../EmailNotificationsAction.java)	(revision 001b71e1b6da336c4adb6376c31ba95d4ace7b28)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(.../EmailNotificationsAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -46,9 +46,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.events.EmailNotificationArchive;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.util.GradebookConstants;
@@ -89,6 +86,10 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * <p>
  * Responsible for "Email notification" functionality.
@@ -162,7 +163,7 @@
 	Organisation org = (Organisation) learnerService.getUserManagementService().findById(Organisation.class, orgId);
 
 	// sort and filter lesson list
-	Set<Lesson> lessons = new TreeSet<Lesson>(new LessonComparator());
+	Set<Lesson> lessons = new TreeSet<>(new LessonComparator());
 	for (Lesson lesson : (Set<Lesson>) org.getLessons()) {
 	    if (!Lesson.REMOVED_STATE.equals(lesson.getLessonStateId())
 		    && !Lesson.FINISHED_STATE.equals(lesson.getLessonStateId())) {
@@ -190,7 +191,7 @@
 	    HttpServletResponse response) throws IOException, ServletException, SchedulerException {
 	getUserManagementService();
 	Scheduler scheduler = getScheduler();
-	TreeSet<EmailScheduleMessageJobDTO> scheduleList = new TreeSet<EmailScheduleMessageJobDTO>();
+	TreeSet<EmailScheduleMessageJobDTO> scheduleList = new TreeSet<>();
 	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID, true);
 	boolean isLessonNotifications = (lessonId != null);
 	Integer organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID, true);
@@ -286,7 +287,7 @@
     }
 
     public ActionForward getArchivedRecipients(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	IMonitoringService monitoringService = MonitoringServiceProxy
 		.getMonitoringService(getServlet().getServletContext());
 
@@ -320,24 +321,24 @@
 		(page - 1) * rowLimit);
 
 	// build JSON which is understood by jqGrid
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put(GradebookConstants.ELEMENT_PAGE, page);
 	responseJSON.put(GradebookConstants.ELEMENT_TOTAL, ((notification.getRecipients().size() - 1) / rowLimit) + 1);
 	responseJSON.put(GradebookConstants.ELEMENT_RECORDS, recipients.size());
 
-	JSONArray rowsJSON = new JSONArray();
+	ArrayNode rowsJSON = JsonNodeFactory.instance.arrayNode();
 	for (User recipient : recipients) {
-	    JSONObject rowJSON = new JSONObject();
+	    ObjectNode rowJSON = JsonNodeFactory.instance.objectNode();
 	    rowJSON.put(GradebookConstants.ELEMENT_ID, recipient.getUserId());
 
-	    JSONArray cellJSON = new JSONArray();
-	    cellJSON.put(recipient.getFirstName() + " " + recipient.getLastName() + " [" + recipient.getLogin() + "]");
+	    ArrayNode cellJSON = JsonNodeFactory.instance.arrayNode();
+	    cellJSON.add(recipient.getFirstName() + " " + recipient.getLastName() + " [" + recipient.getLogin() + "]");
 
-	    rowJSON.put(GradebookConstants.ELEMENT_CELL, cellJSON);
-	    rowsJSON.put(rowJSON);
+	    rowJSON.set(GradebookConstants.ELEMENT_CELL, cellJSON);
+	    rowsJSON.add(rowJSON);
 	}
 
-	responseJSON.put(GradebookConstants.ELEMENT_ROWS, rowsJSON);
+	responseJSON.set(GradebookConstants.ELEMENT_ROWS, rowsJSON);
 	writeResponse(response, "text/json", LamsDispatchAction.ENCODING_UTF8, responseJSON.toString());
 	return null;
     }
@@ -348,7 +349,7 @@
      * @throws JSONException
      */
     public ActionForward deleteNotification(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, SchedulerException, JSONException {
+	    HttpServletResponse response) throws IOException, ServletException, SchedulerException {
 
 	String inputTriggerName = WebUtil.readStrParam(request, "triggerName");
 	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID, true);
@@ -361,7 +362,7 @@
 	getUserManagementService();
 	Scheduler scheduler = getScheduler();
 
-	JSONObject jsonObject = new JSONObject();
+	ObjectNode jsonObject = JsonNodeFactory.instance.objectNode();
 	String error = null;
 
 	try {
@@ -463,8 +464,9 @@
      * Method called via Ajax. It either emails selected users or schedules these emails to be sent on specified date.
      */
     public ActionForward emailUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, JSONException {
-	JSONObject JSONObject = new JSONObject();
+	    HttpServletResponse response) throws IOException, ServletException {
+
+	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
 	IMonitoringService monitoringService = MonitoringServiceProxy
 		.getMonitoringService(getServlet().getServletContext());
 
@@ -492,7 +494,7 @@
 		    WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID, true),
 		    WebUtil.readIntParam(request, "searchType", true), emailBody, userIdInts);
 
-	    JSONObject.put("isSuccessfullySent", isSuccessfullySent);
+	    ObjectNode.put("isSuccessfullySent", isSuccessfullySent);
 
 	    //prepare data for audit log
 	    scheduleDateStr = "now";
@@ -524,7 +526,7 @@
 		// start the scheduling job
 		Scheduler scheduler = getScheduler();
 		scheduler.scheduleJob(emailScheduleMessageJob, startLessonTrigger);
-		JSONObject.put("isSuccessfullyScheduled", true);
+		ObjectNode.put("isSuccessfullyScheduled", true);
 
 		//prepare data for audit log
 		scheduleDateStr = "on " + scheduleDate;
@@ -551,16 +553,16 @@
 			+ " with the following notice:  " + emailBody);
 
 	response.setContentType("application/json;charset=utf-8");
-	response.getWriter().print(JSONObject);
+	response.getWriter().print(ObjectNode);
 	return null;
     }
 
     /**
      * Refreshes user list.
      */
     public ActionForward getUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, JSONException {
-	Map<String, Object> map = new HashMap<String, Object>();
+	    HttpServletResponse response) throws IOException, ServletException {
+	Map<String, Object> map = new HashMap<>();
 	copySearchParametersFromRequestToMap(request, map);
 	Long lessonId = (Long) map.get(AttributeNames.PARAM_LESSON_ID);
 	Integer orgId = (Integer) map.get(AttributeNames.PARAM_ORGANISATION_ID);
@@ -589,27 +591,27 @@
 	Collection<User> users = monitoringService.getUsersByEmailNotificationSearchType(searchType, lessonId,
 		lessonIds, activityId, xDaystoFinish, orgId);
 
-	JSONArray cellarray = new JSONArray();
+	ArrayNode cellarray = JsonNodeFactory.instance.arrayNode();
 
-	JSONObject responcedata = new JSONObject();
-	responcedata.put("total", "" + users.size());
-	responcedata.put("page", "" + 1);
-	responcedata.put("records", "" + users.size());
+	ObjectNode responseDate = JsonNodeFactory.instance.objectNode();
+	responseDate.put("total", "" + users.size());
+	responseDate.put("page", "" + 1);
+	responseDate.put("records", "" + users.size());
 
 	for (User user : users) {
-	    JSONArray cell = new JSONArray();
-	    cell.put(StringEscapeUtils.escapeHtml(user.getFirstName()) + " "
+	    ArrayNode cell = JsonNodeFactory.instance.arrayNode();
+	    cell.add(StringEscapeUtils.escapeHtml(user.getFirstName()) + " "
 		    + StringEscapeUtils.escapeHtml(user.getLastName()) + " ["
 		    + StringEscapeUtils.escapeHtml(user.getLogin()) + "]");
 
-	    JSONObject cellobj = new JSONObject();
+	    ObjectNode cellobj = JsonNodeFactory.instance.objectNode();
 	    cellobj.put("id", "" + user.getUserId());
-	    cellobj.put("cell", cell);
-	    cellarray.put(cellobj);
+	    cellobj.set("cell", cell);
+	    cellarray.add(cellobj);
 	}
-	responcedata.put("rows", cellarray);
+	responseDate.set("rows", cellarray);
 	response.setContentType("application/json;charset=utf-8");
-	response.getWriter().print(new String(responcedata.toString()));
+	response.getWriter().print(new String(responseDate.toString()));
 	return null;
     }
 
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
===================================================================
diff -u -r092ede3b8b3828ffa688c4db18c5d535e3364b98 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(.../GroupingAJAXAction.java)	(revision 092ede3b8b3828ffa688c4db18c5d535e3364b98)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(.../GroupingAJAXAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -43,8 +43,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.learning.web.action.GroupingAction;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.Group;
@@ -69,6 +67,9 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * The action servlet that provides the support for the
  * <UL>
@@ -92,15 +93,14 @@
     public static final String PARAM_MAY_DELETE = "mayDelete";
     public static final String PARAM_USED_FOR_BRANCHING = "usedForBranching";
     public static final String PARAM_VIEW_MODE = "viewMode";
-    
+
     private static ISecurityService securityService;
 
     /**
      * Start the process of doing the chosen grouping
      *
      * Input parameters: activityID
      */
-    @SuppressWarnings("unchecked")
     public ActionForward startGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException {
 	
@@ -153,13 +153,13 @@
 	    return mapping.findForward(GroupingAJAXAction.CHOSEN_GROUPING_SCREEN);
 	}
 
-	SortedSet<Group> groups = new TreeSet<Group>(new GroupComparator());
+	SortedSet<Group> groups = new TreeSet<>(new GroupComparator());
 	groups.addAll(grouping.getGroups());
 
 	// sort users with first, then last name, then login
 	Comparator<User> userComparator = new FirstNameAlphabeticComparator();
 	for (Group group : groups) {
-	    Set<User> sortedUsers = new TreeSet<User>(userComparator);
+	    Set<User> sortedUsers = new TreeSet<>(userComparator);
 	    sortedUsers.addAll(group.getUsers());
 	    group.setUsers(sortedUsers);
 	}
@@ -212,9 +212,9 @@
      * Moves users between groups, removing them from previous group and creating a new one, if needed.
      */
     public ActionForward addMembers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	response.setContentType("application/json;charset=utf-8");
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	boolean result = true;
 
 	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
@@ -297,12 +297,12 @@
 	response.getWriter().write(responseJSON.toString());
 	return null;
     }
-    
+
     /**
      * Stores lesson grouping as a course grouping.
      */
     public ActionForward saveAsCourseGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	IMonitoringService monitoringService = MonitoringServiceProxy
 		.getMonitoringService(getServlet().getServletContext());
 	IUserManagementService userManagementService = MonitoringServiceProxy
@@ -311,7 +311,7 @@
 	Integer userId = ((UserDTO) ss.getAttribute(AttributeNames.USER)).getUserID();
 	Integer organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
 	String newGroupingName = request.getParameter("name");
-	
+
 	// check if user is allowed to view and edit groupings
 	if (!getSecurityService().hasOrgRole(organisationId, userId,
 		new String[] { Role.GROUP_ADMIN, Role.GROUP_MANAGER, Role.MONITOR, Role.AUTHOR },
@@ -326,12 +326,12 @@
 		: ((GroupingActivity) activity).getCreateGrouping();
 
 	// iterate over groups
-	List<OrganisationGroup> orgGroups = new LinkedList<OrganisationGroup>();
+	List<OrganisationGroup> orgGroups = new LinkedList<>();
 	for (Group group : grouping.getGroups()) {
 	    OrganisationGroup orgGroup = new OrganisationGroup();
 	    //groupId and GroupingId will be set during  userManagementService.saveOrganisationGrouping() call
 	    orgGroup.setName(group.getGroupName());
-	    HashSet<User> users = new HashSet<User>();
+	    HashSet<User> users = new HashSet<>();
 	    users.addAll(group.getUsers());
 	    orgGroup.setUsers(users);
 
@@ -345,11 +345,11 @@
 	userManagementService.saveOrganisationGrouping(orgGrouping, orgGroups);
 
 	response.setContentType("application/json;charset=utf-8");
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("result", true);
 	response.getWriter().write(responseJSON.toString());
 	return null;
-    }   
+    }
 
     /**
      * Renames the group.
@@ -368,26 +368,29 @@
 	}
 	return null;
     }
-    
+
     /**
-     * Checks if a course grouping name is unique inside of this organisation and thus whether the new group can be named using it
+     * Checks if a course grouping name is unique inside of this organisation and thus whether the new group can be
+     * named using it
      */
+    @SuppressWarnings("unchecked")
     public ActionForward checkGroupingNameUnique(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
-	IUserManagementService userManagementService = MonitoringServiceProxy.getUserManagementService(getServlet().getServletContext());
-	
+	    HttpServletResponse response) throws IOException {
+	IUserManagementService userManagementService = MonitoringServiceProxy
+		.getUserManagementService(getServlet().getServletContext());
+
 	Integer organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
 	String newGroupingName = request.getParameter("name");
 
 	// Checks if a course grouping name is unique inside of this group and thus new group can have it
-	HashMap<String, Object> properties = new HashMap<String, Object>();
+	HashMap<String, Object> properties = new HashMap<>();
 	properties.put("organisationId", organisationId);
 	properties.put("name", newGroupingName);
 	List<OrganisationGrouping> orgGroupings = userManagementService.findByProperties(OrganisationGrouping.class,
 		properties);
 	boolean isGroupingNameUnique = orgGroupings.isEmpty();
-	
-	JSONObject responseJSON = new JSONObject();
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("isGroupingNameUnique", isGroupingNameUnique);
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().write(responseJSON.toString());
@@ -398,7 +401,7 @@
      * Checks if a group can be removed and performs it.
      */
     public ActionForward removeGroup(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	response.setContentType("application/json;charset=utf-8");
 	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
 	Long groupID = WebUtil.readLongParam(request, AttributeNames.PARAM_GROUP_ID);
@@ -422,12 +425,12 @@
 		result = false;
 	    }
 	}
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("result", result);
 	response.getWriter().write(responseJSON.toString());
 	return null;
     }
-    
+
     private ISecurityService getSecurityService() {
 	if (securityService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
===================================================================
diff -u
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java	(revision 0)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -0,0 +1,548 @@
+/****************************************************************
+ * 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.monitoring.web;
+
+import java.io.IOException;
+import java.security.InvalidParameterException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.actions.DispatchAction;
+import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.Group;
+import org.lamsfoundation.lams.learningdesign.GroupComparator;
+import org.lamsfoundation.lams.learningdesign.Grouping;
+import org.lamsfoundation.lams.learningdesign.GroupingActivity;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
+import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationGroup;
+import org.lamsfoundation.lams.usermanagement.OrganisationGrouping;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.AlphanumComparator;
+import org.lamsfoundation.lams.util.ExcelCell;
+import org.lamsfoundation.lams.util.ExcelUtil;
+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;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * The action servlet that provides the support for the AJAX based Chosen Grouping upload from File
+ * 
+ * @author Fiona Malikoff
+ */
+public class GroupingUploadAJAXAction extends DispatchAction {
+
+    private static Logger log = Logger.getLogger(GroupingUploadAJAXAction.class);
+
+    private static IUserManagementService userManagementService;
+    private static ILessonService lessonService;
+    private static ISecurityService securityService;
+    private static MessageService centralMessageService;
+
+    /**
+     * Get the spreadsheet file containing list of the current users, ready for uploading with groups. If lesson
+     * supplied,
+     * list lesson users, otherwise list organisation users (course grouping screen has just the organisation).
+     * 
+     * @throws Exception
+     */
+    public ActionForward getGroupTemplateFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+
+	Integer userId = getUserDTO().getUserID();
+	Integer organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID, true);
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID, true);
+
+	if (lessonId == null && organisationId == null) {
+	    log.error("Cannot create group template file as lessonId and organisationId are both null.");
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "Invalid parameters");
+	}
+
+	Lesson lesson = null;
+	String lessonOrOrganisationName = null;
+
+	if (lessonId != null) {
+	    lesson = (Lesson) getUserManagementService().findById(Lesson.class, lessonId);
+	    lessonOrOrganisationName = lesson.getLessonName();
+	    organisationId = lesson.getOrganisation().getOrganisationId();
+	} else {
+	    Organisation organisation = (Organisation) getUserManagementService().findById(Organisation.class,
+		    organisationId);
+	    lessonOrOrganisationName = organisation.getName();
+	}
+
+	// check if user is allowed to view and edit groups
+	if (!getSecurityService().hasOrgRole(organisationId, userId,
+		new String[] { Role.GROUP_ADMIN, Role.GROUP_MANAGER, Role.MONITOR, Role.AUTHOR },
+		"view organisation groups", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a participant in the organisation");
+	    return null;
+	}
+
+	String fileName = new StringBuilder(
+		getCentralMessageService().getMessage("filename.create.grouping.template").trim()).append(" ")
+			.append(lessonOrOrganisationName).append(".xls").toString().replaceAll(" ", "-");
+	fileName = FileUtil.encodeFilenameForDownload(request, fileName);
+
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = null;
+
+	if (lesson != null) {
+	    Set<User> learners = lesson.getLessonClass().getLearners();
+	    // check for any groups already exist in this grouping
+	    Long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+	    IMonitoringService monitoringService = MonitoringServiceProxy
+		    .getMonitoringService(getServlet().getServletContext());
+	    Activity activity = monitoringService.getActivityById(activityId);
+	    Grouping grouping = activity.isChosenBranchingActivity() ? activity.getGrouping()
+		    : ((GroupingActivity) activity).getCreateGrouping();
+	    dataToExport = exportLearnersForGrouping(learners, grouping.getGroups(), null);
+
+	} else {
+	    @SuppressWarnings("unchecked")
+	    Long groupingId = WebUtil.readLongParam(request, "groupingId", true);
+	    Set<OrganisationGroup> groups = null;
+	    if (groupingId != null) {
+		OrganisationGrouping orgGrouping = (OrganisationGrouping) getUserManagementService()
+			.findById(OrganisationGrouping.class, groupingId);
+		if (orgGrouping != null)
+		    groups = orgGrouping.getGroups();
+	    }
+	    Vector<User> learners = (Vector<User>) getUserManagementService()
+		    .getUsersFromOrganisationByRole(organisationId, Role.LEARNER, true);
+	    dataToExport = exportLearnersForGrouping(learners, null, groups);
+	}
+
+	// set cookie that will tell JS script that export has been finished
+	String downloadTokenValue = WebUtil.readStrParam(request, "downloadTokenValue");
+	Cookie fileDownloadTokenCookie = new Cookie("fileDownloadToken", downloadTokenValue);
+	fileDownloadTokenCookie.setPath("/");
+	response.addCookie(fileDownloadTokenCookie);
+
+	response.setContentType("application/x-download");
+	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+	ServletOutputStream out = response.getOutputStream();
+	ExcelUtil.createExcelXLS(out, dataToExport, null, false);
+	return null;
+    }
+
+    private LinkedHashMap<String, ExcelCell[][]> exportLearnersForGrouping(Collection<User> learners, Set<Group> groups,
+	    Set<OrganisationGroup> orgGroups) {
+
+	List<ExcelCell[]> rowList = new LinkedList<ExcelCell[]>();
+	int numberOfColumns = 4;
+
+	ExcelCell[] title = new ExcelCell[numberOfColumns];
+	title[0] = new ExcelCell(getCentralMessageService().getMessage("spreadsheet.column.login"), false);
+	title[1] = new ExcelCell(getCentralMessageService().getMessage("spreadsheet.column.firstname"), false);
+	title[2] = new ExcelCell(getCentralMessageService().getMessage("spreadsheet.column.lastname"), false);
+	title[3] = new ExcelCell(getCentralMessageService().getMessage("spreadsheet.column.groupname"), false);
+	rowList.add(title);
+
+	if (groups != null) {
+	    List<Group> groupList = new LinkedList<>(groups);
+	    Collections.sort(groupList, new GroupComparator());
+	    for (Group group : groupList) {
+		String groupName = group.getGroupName();
+		for (User groupUser : group.getUsers()) {
+		    rowList.add(generateUserRow(numberOfColumns, groupName, groupUser));
+		    learners.remove(groupUser);
+		}
+	    }
+	}
+
+	if (orgGroups != null) {
+	    List<OrganisationGroup> groupList = new LinkedList<>(orgGroups);
+	    for (OrganisationGroup group : groupList) {
+		String groupName = group.getName();
+		for (User groupUser : group.getUsers()) {
+		    rowList.add(generateUserRow(numberOfColumns, groupName, groupUser));
+		    learners.remove(groupUser);
+		}
+	    }
+	}
+
+	// all the remaining users are unassigned to any group
+	for (User unassignedUser : learners) {
+	    rowList.add(generateUserRow(numberOfColumns, null, unassignedUser));
+	}
+
+	ExcelCell[][] summaryData = rowList.toArray(new ExcelCell[][] {});
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = new LinkedHashMap<String, ExcelCell[][]>();
+	dataToExport.put(getCentralMessageService().getMessage("label.course.groups.prefix"), summaryData);
+	return dataToExport;
+    }
+
+    private ExcelCell[] generateUserRow(int numberOfColumns, String groupName, User groupUser) {
+	ExcelCell[] userRow = new ExcelCell[numberOfColumns];
+	userRow[0] = new ExcelCell(groupUser.getLogin(), false);
+	userRow[1] = new ExcelCell(groupUser.getFirstName(), false);
+	userRow[2] = new ExcelCell(groupUser.getLastName(), false);
+	userRow[3] = new ExcelCell(groupName, false);
+	return userRow;
+    }
+
+    /**
+     * Saves a course grouping.
+     */
+    public ActionForward importLearnersForGrouping(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws InvalidParameterException, IOException {
+
+	Integer userId = getUserDTO().getUserID();
+	Integer organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID, true);
+	boolean isLessonMode = WebUtil.readBooleanParam(request, "lessonMode", true);
+
+	// used for lesson based grouping
+	Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID, true);
+	Long activityId = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID, true);
+	Lesson lesson = lessonId != null ? (Lesson) getUserManagementService().findById(Lesson.class, lessonId) : null;
+
+	// used for course grouping
+	Long groupingId = WebUtil.readLongParam(request, "groupingId", true);
+	String name = WebUtil.readStrParam(request, "name", true);
+	if (isLessonMode && activityId == null) {
+	    log.error("Lesson grouping to be saved but activityId is missing");
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "Invalid parameters");
+	} else if (!isLessonMode) {
+	    if ((groupingId == null && name == null) || organisationId == null) {
+		log.error("Course grouping to be saved but groupingId, grouping name or organisationId is missing");
+		response.sendError(HttpServletResponse.SC_FORBIDDEN, "Invalid parameters");
+	    }
+	}
+
+	Organisation organisation;
+	if (organisationId == null) {
+	    // read organisation ID from lesson
+	    organisation = lesson.getOrganisation();
+	    organisationId = organisation.getOrganisationId();
+	} else {
+	    organisation = (Organisation) getUserManagementService().findById(Organisation.class, organisationId);
+	}
+
+	// check if user is allowed to save grouping
+	if (!getSecurityService().hasOrgRole(organisationId, userId,
+		new String[] { Role.GROUP_ADMIN, Role.GROUP_MANAGER, Role.MONITOR, Role.AUTHOR },
+		"save organisation grouping from spreadsheet", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a manager or admin in the organisation");
+	    return null;
+	}
+
+	@SuppressWarnings("rawtypes")
+	Hashtable fileElements = form.getMultipartRequestHandler().getFileElements();
+	if (fileElements.size() == 0) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "No file provided");
+	}
+	if (GroupingUploadAJAXAction.log.isDebugEnabled()) {
+	    GroupingUploadAJAXAction.log.debug("Saving course groups from spreadsheet for user " + userId
+		    + " and organisation " + organisationId + " filename " + fileElements);
+	}
+
+	ObjectNode responseJSON = null;
+
+	if (isLessonMode) {
+	    responseJSON = saveLessonGrouping(response, activityId, fileElements);
+	} else {
+	    responseJSON = saveCourseGrouping(response, organisation, groupingId, name, fileElements);
+	}
+
+	response.getWriter().write(responseJSON.toString());
+	return null;
+    }
+
+    /** Create the new course grouping */
+    private ObjectNode saveCourseGrouping(HttpServletResponse response, Organisation organisation, Long orgGroupingId,
+	    String name, Hashtable fileElements) throws IOException {
+
+	OrganisationGrouping orgGrouping = null;
+	if (orgGroupingId != null) {
+	    orgGrouping = (OrganisationGrouping) getUserManagementService().findById(OrganisationGrouping.class,
+		    orgGroupingId);
+	}
+	if (orgGrouping == null) {
+	    orgGrouping = new OrganisationGrouping();
+	    orgGrouping.setOrganisationId(organisation.getOrganisationId());
+	    orgGrouping.setName(name);
+	}
+
+	Map<String, Long> existingGroupNameToId = new HashMap<String, Long>();
+	Map<String, Set<String>> groups = new HashMap<String, Set<String>>();
+	if (orgGrouping.getGroups() != null) {
+	    for (OrganisationGroup group : orgGrouping.getGroups()) {
+		existingGroupNameToId.put(group.getName(), group.getGroupId());
+	    }
+	}
+
+	int totalUsersSkipped = parseGroupSpreadsheet((FormFile) fileElements.elements().nextElement(), orgGroupingId,
+		groups);
+	int totalUsersAdded = 0;
+
+	List<OrganisationGroup> orgGroups = new LinkedList<>();
+	for (Map.Entry<String, Set<String>> groupEntry : groups.entrySet()) {
+	    String groupName = groupEntry.getKey();
+	    // just overwrite existing groups; they will be updated if already exist
+	    Set<User> learners = new HashSet<>();
+	    for (String login : groupEntry.getValue()) {
+		User learner = (User) getUserManagementService().getUserByLogin(login);
+		if (learner == null) {
+		    log.warn("Unable to add learner " + login + " for group in related to grouping " + orgGroupingId
+			    + " as learner cannot be found.");
+		    totalUsersSkipped++;
+		} else {
+		    totalUsersAdded++;
+		    learners.add(learner);
+		}
+	    }
+	    OrganisationGroup orgGroup = new OrganisationGroup();
+	    Long orgGroupId = existingGroupNameToId.get(groupName);
+	    if (orgGroupId != null) {
+		orgGroup.setGroupId(orgGroupId);
+		orgGroup.setGroupingId(orgGroupingId);
+	    }
+	    orgGroup.setName(groupName);
+	    orgGroup.setUsers(learners);
+	    orgGroups.add(orgGroup);
+	}
+
+	getUserManagementService().saveOrganisationGrouping(orgGrouping, orgGroups);
+	return createResponseJSON(response, false, null, true, orgGrouping.getGroupingId(), totalUsersAdded,
+		totalUsersSkipped);
+
+    }
+
+    /** Clean out and reuse any existing groups */
+    private ObjectNode saveLessonGrouping(HttpServletResponse response, Long activityId, Hashtable fileElements)
+	    throws IOException {
+
+	IMonitoringService monitoringService = MonitoringServiceProxy
+		.getMonitoringService(getServlet().getServletContext());
+
+	Map<String, Set<String>> groups = new HashMap<String, Set<String>>();
+	int totalUsersSkipped = 0;
+	int totalUsersAdded = 0;
+
+	// Lesson grouping case so clean out and reuse any existing groups
+	Activity activity = monitoringService.getActivityById(activityId);
+	Grouping grouping = activity.isChosenBranchingActivity() ? activity.getGrouping()
+		: ((GroupingActivity) activity).getCreateGrouping();
+
+	Set<String> existingGroupNames = new HashSet<String>();
+	// check for any users starting to use the groups since the page was loaded.
+	for (Group group : grouping.getGroups()) {
+	    existingGroupNames.add(group.getGroupName());
+	    if (!group.mayBeDeleted()) {
+		String error = getCentralMessageService().getMessage("error.groups.upload.locked");
+		return createResponseJSON(response, true, error, true, grouping.getGroupingId(), 0, 0);
+	    }
+	}
+
+	totalUsersSkipped = parseGroupSpreadsheet((FormFile) fileElements.elements().nextElement(),
+		grouping.getGroupingId(), groups);
+
+	// if branching must use the already specified groups or cannot match to a branch!
+	if (activity.isChosenBranchingActivity()) {
+	    for (Map.Entry<String, Set<String>> groupEntry : groups.entrySet()) {
+		if (!existingGroupNames.contains(groupEntry.getKey())) {
+		    StringBuilder groupNamesStrBlder = new StringBuilder();
+		    for (String name : existingGroupNames)
+			groupNamesStrBlder.append("'").append(name).append("' ");
+		    String error = getCentralMessageService().getMessage(
+			    "error.branching.upload.must.use.existing.groups",
+			    new String[] { groupNamesStrBlder.toString() });
+		    return createResponseJSON(response, true, error.toString(), false, grouping.getGroupingId(), 0, 0);
+		}
+	    }
+	}
+
+	// remove all the existing users from their groups
+	getLessonService().removeAllLearnersFromGrouping(grouping);
+
+	// Now put in the new users groupings
+	for (Map.Entry<String, Set<String>> groupEntry : groups.entrySet()) {
+	    int added = monitoringService.addUsersToGroupByLogins(activityId, groupEntry.getKey(),
+		    groupEntry.getValue());
+	    totalUsersAdded += added;
+	    totalUsersSkipped += groupEntry.getValue().size() - added;
+	}
+
+	return createResponseJSON(response, false, null, true, grouping.getGroupingId(), totalUsersAdded,
+		totalUsersSkipped);
+    }
+
+    private ObjectNode createResponseJSON(HttpServletResponse response, boolean isError, String errorMessage,
+	    boolean reload, Long groupingId, int totalUsersAdded, int totalUsersSkipped) {
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	if (isError) {
+	    responseJSON.put("result", "FAIL");
+	    responseJSON.put("reload", reload);
+	    responseJSON.put("error", errorMessage);
+	} else {
+	    responseJSON.put("result", "OK");
+	    responseJSON.put("added", totalUsersAdded);
+	    responseJSON.put("skipped", totalUsersSkipped);
+	}
+	responseJSON.put("groupingId", groupingId);
+	return responseJSON;
+    }
+
+    /* XLS Version Parse */
+    private String parseStringCell(HSSFCell cell) {
+	if (cell != null) {
+	    cell.setCellType(Cell.CELL_TYPE_STRING);
+	    if (cell.getStringCellValue() != null) {
+		return cell.getStringCellValue().trim();
+	    }
+	}
+	return null;
+    }
+
+    public int parseGroupSpreadsheet(FormFile fileItem, Long groupingID, Map<String, Set<String>> groups)
+	    throws IOException {
+	POIFSFileSystem fs = new POIFSFileSystem(fileItem.getInputStream());
+	HSSFWorkbook wb = new HSSFWorkbook(fs);
+	HSSFSheet sheet = wb.getSheetAt(0);
+
+	int startRow = sheet.getFirstRowNum();
+	int endRow = sheet.getLastRowNum();
+	int skipped = 0;
+
+	for (int i = startRow + 1; i < (endRow + 1); i++) {
+	    HSSFRow row = sheet.getRow(i);
+	    String login = parseStringCell(row.getCell(0));
+	    if (login != null) {
+		login = login.trim();
+		if (login.length() > 0) {
+		    String groupName = row.getLastCellNum() > 3 ? parseStringCell(row.getCell(3)) : null;
+		    groupName = groupName != null ? groupName.trim() : null;
+		    if (groupName == null || groupName.length() == 0) {
+			skipped++;
+			GroupingUploadAJAXAction.log.warn("Unable to add learner " + login
+				+ " for group in related to grouping " + groupingID + " as group name is missing.");
+		    } else {
+			Set<String> users = groups.get(groupName);
+			if (users == null) {
+			    users = new HashSet<String>();
+			    groups.put(groupName, users);
+			}
+			users.add(login);
+		    }
+		}
+	    }
+	}
+	return skipped;
+    }
+
+    final Comparator<OrganisationGroup> ORG_GROUP_COMPARATOR = new Comparator<OrganisationGroup>() {
+	@Override
+	public int compare(OrganisationGroup o1, OrganisationGroup o2) {
+	    String grp1Name = o1 != null ? o1.getName() : "";
+	    String grp2Name = o2 != null ? o2.getName() : "";
+
+	    AlphanumComparator comparator = new AlphanumComparator();
+	    return comparator.compare(grp1Name, grp2Name);
+	}
+    };
+
+    private UserDTO getUserDTO() {
+	HttpSession ss = SessionManager.getSession();
+	return (UserDTO) ss.getAttribute(AttributeNames.USER);
+    }
+
+    private IUserManagementService getUserManagementService() {
+	if (GroupingUploadAJAXAction.userManagementService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    GroupingUploadAJAXAction.userManagementService = (IUserManagementService) ctx
+		    .getBean("userManagementService");
+	}
+	return GroupingUploadAJAXAction.userManagementService;
+    }
+
+    private ILessonService getLessonService() {
+	if (GroupingUploadAJAXAction.lessonService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    GroupingUploadAJAXAction.lessonService = (ILessonService) ctx.getBean("lessonService");
+	}
+	return GroupingUploadAJAXAction.lessonService;
+    }
+
+    private ISecurityService getSecurityService() {
+	if (GroupingUploadAJAXAction.securityService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    GroupingUploadAJAXAction.securityService = (ISecurityService) ctx.getBean("securityService");
+	}
+	return GroupingUploadAJAXAction.securityService;
+    }
+
+    private MessageService getCentralMessageService() {
+	if (GroupingUploadAJAXAction.centralMessageService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    GroupingUploadAJAXAction.centralMessageService = (MessageService) ctx.getBean("centralMessageService");
+	}
+	return GroupingUploadAJAXAction.centralMessageService;
+    }
+
+}
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -rfe122f9f7ac40f3a3696a7c69043fc34df7994d4 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision fe122f9f7ac40f3a3696a7c69043fc34df7994d4)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -52,9 +52,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.authoring.ObjectExtractor;
 import org.lamsfoundation.lams.authoring.service.IAuthoringService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -89,6 +86,7 @@
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.DateUtil;
+import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.ValidationUtil;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -99,8 +97,9 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
  * The action servlet that provide all the monitoring functionalities. It interact with the teacher via JSP monitoring
@@ -313,7 +312,7 @@
 
 	// either all users participate in a lesson, or we split them among instances
 	List<User> lessonInstanceLearners = splitNumberLessons == null ? learners
-		: new ArrayList<User>((learners.size() / splitNumberLessons) + 1);
+		: new ArrayList<>((learners.size() / splitNumberLessons) + 1);
 	for (int lessonIndex = 1; lessonIndex <= (splitNumberLessons == null ? 1 : splitNumberLessons); lessonIndex++) {
 	    String lessonInstanceName = lessonName;
 	    String learnerGroupInstanceName = learnerGroupName;
@@ -511,7 +510,7 @@
      * @throws ServletException
      */
     public ActionForward removeLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException, ServletException {
+	    HttpServletResponse response) throws IOException, ServletException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	Integer userId = getUserId();
 	boolean permanently = WebUtil.readBooleanParam(request, "permanently", false);
@@ -523,7 +522,7 @@
 	    return null;
 	}
 
-	JSONObject jsonObject = new JSONObject();
+	ObjectNode jsonObject = JsonNodeFactory.instance.objectNode();
 
 	try {
 	    // if this method throws an Exception, there will be no removeLesson=true in the JSON reply
@@ -557,7 +556,7 @@
      * @throws JSONException
      */
     public ActionForward forceComplete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, JSONException {
+	    HttpServletResponse response) throws IOException, ServletException {
 	getAuditService();
 	// get parameters
 	Long activityId = null;
@@ -576,7 +575,7 @@
 	boolean removeLearnerContent = WebUtil.readBooleanParam(request,
 		MonitoringConstants.PARAM_REMOVE_LEARNER_CONTENT, false);
 
-	JSONObject jsonCommand = new JSONObject();
+	ObjectNode jsonCommand = JsonNodeFactory.instance.objectNode();
 	jsonCommand.put("message", getMessageService().getMessage("force.complete.learner.command.message"));
 	jsonCommand.put("redirectURL", "/lams/learning/learner.do?method=joinLesson&lessonID=" + lessonId);
 	String command = jsonCommand.toString();
@@ -617,7 +616,7 @@
      * Get learners who are part of the lesson class.
      */
     public ActionForward getLessonLearners(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
+	    HttpServletResponse response) throws IOException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	if (!getSecurityService().isLessonMonitor(lessonId, getUserId(), "get lesson learners", false)) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
@@ -633,15 +632,15 @@
 
 	List<User> learners = getLessonService().getLessonLearners(lessonId, searchPhrase,
 		MonitoringAction.USER_PAGE_SIZE, (pageNumber - 1) * MonitoringAction.USER_PAGE_SIZE, orderAscending);
-	JSONArray learnersJSON = new JSONArray();
+	ArrayNode learnersJSON = JsonNodeFactory.instance.arrayNode();
 	for (User learner : learners) {
-	    learnersJSON.put(WebUtil.userToJSON(learner));
+	    learnersJSON.add(WebUtil.userToJSON(learner));
 	}
 
 	Integer learnerCount = getLessonService().getCountLessonLearners(lessonId, searchPhrase);
 
-	JSONObject responseJSON = new JSONObject();
-	responseJSON.put("learners", learnersJSON);
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.set("learners", learnersJSON);
 	responseJSON.put("learnerCount", learnerCount);
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().write(responseJSON.toString());
@@ -652,7 +651,7 @@
      * Gets learners or monitors of the lesson and organisation containing it.
      */
     public ActionForward getClassMembers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
+	    HttpServletResponse response) throws IOException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	if (!getSecurityService().isLessonMonitor(lessonId, getUserId(), "get class members", false)) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
@@ -670,7 +669,7 @@
 	    pageNumber = 1;
 	}
 	boolean orderAscending = WebUtil.readBooleanParam(request, "orderAscending", true);
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 
 	// find organisation users and whether they participate in the current lesson
 	Map<User, Boolean> users = getLessonService().getUsersWithLessonParticipation(lessonId, role, searchPhrase,
@@ -683,18 +682,18 @@
 
 	responseJSON.put("userCount", userCount);
 
-	JSONArray usersJSON = new JSONArray();
+	ArrayNode usersJSON = JsonNodeFactory.instance.arrayNode();
 	for (Entry<User, Boolean> userEntry : users.entrySet()) {
 	    User user = userEntry.getKey();
-	    JSONObject userJSON = WebUtil.userToJSON(user);
+	    ObjectNode userJSON = WebUtil.userToJSON(user);
 	    userJSON.put("classMember", userEntry.getValue());
 	    // teacher can't remove lesson creator and himself from the lesson staff
 	    if (isMonitor && (creator.getUserId().equals(user.getUserId()) || currentUserId.equals(user.getUserId()))) {
 		userJSON.put("readonly", true);
 	    }
-	    usersJSON.put(userJSON);
+	    usersJSON.add(userJSON);
 	}
-	responseJSON.put("users", usersJSON);
+	responseJSON.set("users", usersJSON);
 
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().write(responseJSON.toString());
@@ -705,8 +704,8 @@
      * Gets users in JSON format who are at the given activity at the moment or finished the given lesson.
      */
     public ActionForward getCurrentLearners(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
-	JSONArray learnersJSON = new JSONArray();
+	    HttpServletResponse response) throws IOException {
+	ArrayNode learnersJSON = JsonNodeFactory.instance.arrayNode();
 	Integer learnerCount = null;
 
 	Integer pageNumber = WebUtil.readIntParam(request, "pageNumber", true);
@@ -727,7 +726,7 @@
 		    MonitoringAction.USER_PAGE_SIZE, (pageNumber - 1) * MonitoringAction.USER_PAGE_SIZE,
 		    orderAscending);
 	    for (User learner : learners) {
-		learnersJSON.put(WebUtil.userToJSON(learner));
+		learnersJSON.add(WebUtil.userToJSON(learner));
 	    }
 
 	    learnerCount = getMonitoringService().getCountLearnersCompletedLesson(lessonId);
@@ -740,21 +739,21 @@
 		return null;
 	    }
 
-	    Set<Long> activities = new TreeSet<Long>();
+	    Set<Long> activities = new TreeSet<>();
 	    activities.add(activityId);
 
 	    List<User> learners = getMonitoringService().getLearnersByActivities(activities.toArray(new Long[] {}),
 		    MonitoringAction.USER_PAGE_SIZE, (pageNumber - 1) * MonitoringAction.USER_PAGE_SIZE,
 		    orderAscending);
 	    for (User learner : learners) {
-		learnersJSON.put(WebUtil.userToJSON(learner));
+		learnersJSON.add(WebUtil.userToJSON(learner));
 	    }
 	    learnerCount = getMonitoringService().getCountLearnersCurrentActivities(new Long[] { activityId })
 		    .get(activityId);
 	}
 
-	JSONObject responseJSON = new JSONObject();
-	responseJSON.put("learners", learnersJSON);
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.set("learners", learnersJSON);
 	responseJSON.put("learnerCount", learnerCount);
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().write(responseJSON.toString());
@@ -765,7 +764,7 @@
      * Adds/removes learners and monitors to/from lesson class.
      */
     public ActionForward updateLessonClass(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
+	    HttpServletResponse response) throws IOException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	if (!getSecurityService().isLessonMonitor(lessonId, getUserId(), "update lesson class", false)) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
@@ -810,7 +809,7 @@
 
 	String module = WebUtil.readStrParam(request, "module", false);
 
-	ArrayList<String> languageCollection = new ArrayList<String>();
+	ArrayList<String> languageCollection = new ArrayList<>();
 	if (module.equals("timechart")) {
 
 	    languageCollection.add(new String("sys.error"));
@@ -939,7 +938,7 @@
      * Gets users whose progress bars will be displayed in Learner tab in Monitor.
      */
     public ActionForward getLearnerProgressPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	if (!getSecurityService().isLessonMonitor(lessonId, getUserId(), "get learner progress page", false)) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
@@ -958,9 +957,9 @@
 	List<User> learners = isProgressSorted
 		? getMonitoringService().getLearnersByMostProgress(lessonId, searchPhrase, 10, (pageNumber - 1) * 10)
 		: getLessonService().getLessonLearners(lessonId, searchPhrase, 10, (pageNumber - 1) * 10, true);
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	for (User learner : learners) {
-	    responseJSON.append("learners", WebUtil.userToJSON(learner));
+	    responseJSON.withArray("learners").add(WebUtil.userToJSON(learner));
 	}
 
 	// get all possible learners matching the given phrase, if any; used for max page number
@@ -974,7 +973,7 @@
      * Produces data to update Lesson tab in Monitor.
      */
     public ActionForward getLessonDetails(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
+	    HttpServletResponse response) throws IOException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	HttpSession ss = SessionManager.getSession();
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -984,7 +983,7 @@
 	    return null;
 	}
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	Lesson lesson = getLessonService().getLesson(lessonId);
 	LearningDesign learningDesign = lesson.getLearningDesign();
 
@@ -1019,8 +1018,7 @@
 	
 	List<ContributeActivityDTO> contributeActivities = getContributeActivities(lessonId, false);
 	if (contributeActivities != null) {
-	    Gson gson = new GsonBuilder().create();
-	    responseJSON.put("contributeActivities", new JSONArray(gson.toJson(contributeActivities)));
+	    responseJSON.set("contributeActivities", JsonUtil.readArray(contributeActivities));
 	}
 
 	response.setContentType("application/json;charset=utf-8");
@@ -1029,7 +1027,7 @@
     }
 
     public ActionForward getLessonChartData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, JSONException {
+	    HttpServletResponse response) throws IOException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 
 	Integer possibleLearnersCount = getLessonService().getCountLessonLearners(lessonId, null);
@@ -1038,21 +1036,21 @@
 		- completedLearnersCount;
 	Integer notCompletedLearnersCount = possibleLearnersCount - completedLearnersCount - startedLearnersCount;
 
-	JSONObject responseJSON = new JSONObject();
-	JSONObject notStartedJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	ObjectNode notStartedJSON = JsonNodeFactory.instance.objectNode();
 	notStartedJSON.put("name", getMessageService().getMessage("lesson.chart.not.completed"));
 	notStartedJSON.put("value", Math.round(notCompletedLearnersCount.doubleValue() / possibleLearnersCount * 100));
-	responseJSON.append("data", notStartedJSON);
+	responseJSON.withArray("data").add(notStartedJSON);
 
-	JSONObject startedJSON = new JSONObject();
+	ObjectNode startedJSON = JsonNodeFactory.instance.objectNode();
 	startedJSON.put("name", getMessageService().getMessage("lesson.chart.started"));
 	startedJSON.put("value", Math.round((startedLearnersCount.doubleValue()) / possibleLearnersCount * 100));
-	responseJSON.append("data", startedJSON);
+	responseJSON.withArray("data").add(startedJSON);
 
-	JSONObject completedJSON = new JSONObject();
+	ObjectNode completedJSON = JsonNodeFactory.instance.objectNode();
 	completedJSON.put("name", getMessageService().getMessage("lesson.chart.completed"));
 	completedJSON.put("value", Math.round(completedLearnersCount.doubleValue() / possibleLearnersCount * 100));
-	responseJSON.append("data", completedJSON);
+	responseJSON.withArray("data").add(completedJSON);
 
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().write(responseJSON.toString());
@@ -1064,7 +1062,7 @@
      */
     @SuppressWarnings("unchecked")
     public ActionForward getLessonProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	Integer monitorUserId = getUserId();
 	if (!getSecurityService().isLessonMonitor(lessonId, monitorUserId, "get lesson progress", false)) {
@@ -1077,7 +1075,7 @@
 	LearningDesign learningDesign = lesson.getLearningDesign();
 	String contentFolderId = learningDesign.getContentFolderID();
 
-	Set<Activity> activities = new HashSet<Activity>();
+	Set<Activity> activities = new HashSet<>();
 	// filter activities that are interesting for further processing
 	for (Activity activity : (Set<Activity>) learningDesign.getActivities()) {
 	    if (activity.isSequenceActivity()) {
@@ -1088,11 +1086,10 @@
 	    activities.add(getMonitoringService().getActivityById(activity.getActivityId()));
 	}
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	List<ContributeActivityDTO> contributeActivities = getContributeActivities(lessonId, true);
 	if (contributeActivities != null) {
-	    Gson gson = new GsonBuilder().create();
-	    responseJSON.put("contributeActivities", new JSONArray(gson.toJson(contributeActivities)));
+	    responseJSON.set("contributeActivities", JsonUtil.readArray(contributeActivities));
 	}
 
 	// check if the searched learner has started the lesson
@@ -1103,8 +1100,8 @@
 	}
 
 	// Fetch number of learners at each activity
-	ArrayList<Long> activityIds = new ArrayList<Long>();
-	Set<Long> leaders = new TreeSet<Long>();
+	ArrayList<Long> activityIds = new ArrayList<>();
+	Set<Long> leaders = new TreeSet<>();
 	for (Activity activity : activities) {
 	    activityIds.add(activity.getActivityId());
 	    // find leaders from Leader Selection Tool
@@ -1120,10 +1117,10 @@
 	Map<Long, Integer> learnerCounts = getMonitoringService()
 		.getCountLearnersCurrentActivities(activityIds.toArray(new Long[activityIds.size()]));
 
-	JSONArray activitiesJSON = new JSONArray();
+	ArrayNode activitiesJSON = JsonNodeFactory.instance.arrayNode();
 	for (Activity activity : activities) {
 	    Long activityId = activity.getActivityId();
-	    JSONObject activityJSON = new JSONObject();
+	    ObjectNode activityJSON = JsonNodeFactory.instance.objectNode();
 	    activityJSON.put("id", activityId);
 	    activityJSON.put("uiid", activity.getActivityUIID());
 	    activityJSON.put("title", activity.getTitle());
@@ -1186,23 +1183,23 @@
 
 		// parse learners into JSON format
 		if (!latestLearners.isEmpty()) {
-		    JSONArray learnersJSON = new JSONArray();
+		    ArrayNode learnersJSON = JsonNodeFactory.instance.arrayNode();
 		    for (User learner : latestLearners) {
-			JSONObject userJSON = WebUtil.userToJSON(learner);
+			ObjectNode userJSON = WebUtil.userToJSON(learner);
 			if (leaders.contains(learner.getUserId().longValue())) {
 			    userJSON.put("leader", true);
 			}
-			learnersJSON.put(userJSON);
+			learnersJSON.add(userJSON);
 		    }
 
-		    activityJSON.put("learners", learnersJSON);
+		    activityJSON.set("learners", learnersJSON);
 		}
 	    }
 	    activityJSON.put("learnerCount", learnerCount);
 
-	    activitiesJSON.put(activityJSON);
+	    activitiesJSON.add(activityJSON);
 	}
-	responseJSON.put("activities", activitiesJSON);
+	responseJSON.set("activities", activitiesJSON);
 
 	// find learners who completed the lesson
 	List<User> completedLearners = getMonitoringService().getLearnersLatestCompleted(lessonId,
@@ -1221,25 +1218,25 @@
 		    completedLearners, MonitoringAction.LATEST_LEARNER_PROGRESS_LESSON_DISPLAY_LIMIT);
 	}
 	for (User learner : completedLearners) {
-	    JSONObject learnerJSON = WebUtil.userToJSON(learner);
+	    ObjectNode learnerJSON = WebUtil.userToJSON(learner);
 	    // no more details are needed for learners who completed the lesson
-	    responseJSON.append("completedLearners", learnerJSON);
+	    responseJSON.withArray("completedLearners").add(learnerJSON);
 	}
 
 	responseJSON.put("numberPossibleLearners", getLessonService().getCountLessonLearners(lessonId, null));
 
 	// on first fetch get transitions metadata so Monitoring can set their SVG elems IDs
 	if (WebUtil.readBooleanParam(request, "getTransitions", false)) {
-	    JSONArray transitions = new JSONArray();
+	    ArrayNode transitions = JsonNodeFactory.instance.arrayNode();
 	    for (Transition transition : (Set<Transition>) learningDesign.getTransitions()) {
-		JSONObject transitionJSON = new JSONObject();
+		ObjectNode transitionJSON = JsonNodeFactory.instance.objectNode();
 		transitionJSON.put("uiid", transition.getTransitionUIID());
 		transitionJSON.put("fromID", transition.getFromActivity().getActivityId());
 		transitionJSON.put("toID", transition.getToActivity().getActivityId());
 
-		transitions.put(transitionJSON);
+		transitions.add(transitionJSON);
 	    }
-	    responseJSON.put("transitions", transitions);
+	    responseJSON.set("transitions", transitions);
 	}
 
 	response.setContentType("application/json;charset=utf-8");
@@ -1274,13 +1271,13 @@
 		    true);
 	}
 
-	JSONArray responseJSON = new JSONArray();
+	ArrayNode responseJSON = JsonNodeFactory.instance.arrayNode();
 	for (User user : users) {
-	    JSONObject userJSON = new JSONObject();
+	    ObjectNode userJSON = JsonNodeFactory.instance.objectNode();
 	    userJSON.put("label", user.getFirstName() + " " + user.getLastName() + " " + user.getLogin());
 	    userJSON.put("value", user.getUserId());
 
-	    responseJSON.put(userJSON);
+	    responseJSON.add(userJSON);
 	}
 
 	response.setContentType("application/json;charset=utf-8");
@@ -1515,7 +1512,7 @@
 	}
 	return null;
     }
-    
+
     /**
      * Set whether or not the activity scores / gradebook values are shown to the learner at the end of the lesson. 
      * Expects parameters lessonID and presenceAvailable.
@@ -1567,7 +1564,7 @@
     private List<User> parseUserList(HttpServletRequest request, String paramName, Collection<User> users) {
 	String userIdList = request.getParameter(paramName);
 	String[] userIdArray = userIdList.split(",");
-	List<User> result = new ArrayList<User>(userIdArray.length);
+	List<User> result = new ArrayList<>(userIdArray.length);
 
 	for (User user : users) {
 	    Integer userId = user.getUserId();
@@ -1588,7 +1585,7 @@
 	Lesson lesson = getLessonService().getLesson(lessonId);
 
 	if (contributeActivities != null) {
-	    List<ContributeActivityDTO> resultContributeActivities = new ArrayList<ContributeActivityDTO>();
+	    List<ContributeActivityDTO> resultContributeActivities = new ArrayList<>();
 	    for (ContributeActivityDTO contributeActivity : contributeActivities) {
 		if (contributeActivity.getContributeEntries() != null) {
 		    Iterator<ContributeActivityDTO.ContributeEntry> entryIterator = contributeActivity
@@ -1599,7 +1596,7 @@
 			// extra filtering for chosen branching: do not show in Sequence tab if all users were assigned
 			if (skipCompletedBranching
 				&& ContributionTypes.CHOSEN_BRANCHING.equals(contributeEntry.getContributionType())) {
-			    Set<User> learners = new HashSet<User>(lesson.getLessonClass().getLearners());
+			    Set<User> learners = new HashSet<>(lesson.getLessonClass().getLearners());
 			    ChosenBranchingActivity branching = (ChosenBranchingActivity) getMonitoringService()
 				    .getActivityById(contributeActivity.getActivityID());
 			    for (SequenceActivity branch : (Set<SequenceActivity>) branching.getActivities()) {
@@ -1635,7 +1632,7 @@
      */
     private static List<User> insertHighlightedLearner(User searchedLearner, List<User> latestLearners, int limit) {
 	latestLearners.remove(searchedLearner);
-	LinkedList<User> updatedLatestLearners = new LinkedList<User>(latestLearners);
+	LinkedList<User> updatedLatestLearners = new LinkedList<>(latestLearners);
 	updatedLatestLearners.addFirst(searchedLearner);
 	if (updatedLatestLearners.size() > limit) {
 	    updatedLatestLearners.removeLast();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r5c770157545dea3dbc72e22a1dd1107c56cf22eb -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -23,6 +23,7 @@
 
 package org.lamsfoundation.lams.tool.assessment.service;
 
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -48,9 +49,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
@@ -114,6 +112,10 @@
 import org.lamsfoundation.lams.util.NumberUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Andrey Balan
  */
@@ -410,8 +412,8 @@
 	//update questions' hashes in case questions' titles or descriptions got changed
 	for (AssessmentQuestion question : (Set<AssessmentQuestion>) assessment.getQuestions()) {
 	    String newHash = question.getQuestion() == null ? null : HashUtil.sha1(question.getQuestion());
-	    question.setQuestionHash(newHash);
-	}
+		question.setQuestionHash(newHash);
+	    }
 	
 	//store object in DB
 	assessmentDao.saveObject(assessment);
@@ -449,7 +451,7 @@
     @Override
     public void setAttemptStarted(Assessment assessment, AssessmentUser assessmentUser, Long toolSessionId) {
 	Set<AssessmentQuestion> questions = assessment.getQuestions();
-	
+
 	AssessmentResult lastResult = getLastAssessmentResult(assessment.getUid(), assessmentUser.getUserId());
 	if (lastResult != null) {
 
@@ -478,7 +480,7 @@
 		assessmentResultDao.saveObject(lastResult);
 		return;
 
-	    // mark previous attempt as being not the latest any longer
+		// mark previous attempt as being not the latest any longer
 	    } else {
 		lastResult.setLatest(null);
 		assessmentResultDao.saveObject(lastResult);
@@ -550,7 +552,8 @@
 	    for (QuestionDTO questionDto : questionsForOnePage) {
 
 		// in case single MarkHedging question needs to be stored -- search for that question
-		if ((singleMarkHedgingQuestionUid != null) && !questionDto.getUid().equals(singleMarkHedgingQuestionUid)) {
+		if ((singleMarkHedgingQuestionUid != null)
+			&& !questionDto.getUid().equals(singleMarkHedgingQuestionUid)) {
 		    continue;
 		}
 
@@ -607,24 +610,24 @@
      * @param isAutosave
      *            in case of autosave there is no need to calculate marks
      * @return grade that user scored by answering that question
-     * @throws NoSuchMethodException 
-     * @throws InvocationTargetException 
-     * @throws IllegalAccessException 
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
      */
-    private float storeUserAnswer(AssessmentResult assessmentResult, QuestionDTO questionDto, boolean isAutosave) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+    private float storeUserAnswer(AssessmentResult assessmentResult, QuestionDTO questionDto, boolean isAutosave)
+	    throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 	Assessment assessment = assessmentResult.getAssessment();
-	
+
 	AssessmentQuestionResult questionResult = null;
 	// get questionResult from DB instance of AssessmentResult
 	for (AssessmentQuestionResult questionResultIter : assessmentResult.getQuestionResults()) {
 	    if (questionDto.getUid().equals(questionResultIter.getAssessmentQuestion().getUid())) {
 		questionResult = questionResultIter;
 	    }
 	}
-	
-	//if teacher edited content in monitor (modified question) it led to removal if autosaved questionResult 
-	if (assessment.isContentModifiedInMonitor(assessmentResult.getStartDate())
-		 && questionResult == null) {
+
+	//if teacher edited content in monitor (modified question) it led to removal if autosaved questionResult
+	if (assessment.isContentModifiedInMonitor(assessmentResult.getStartDate()) && questionResult == null) {
 	    //update questionDto
 	    AssessmentQuestion modifiedQuestion = assessmentQuestionDao.getByUid(questionDto.getUid());
 	    QuestionDTO updatedQuestionDto = modifiedQuestion.getQuestionDTO();
@@ -655,7 +658,7 @@
 		optionAnswer.setAnswerInt(j++);
 	    }
 	}
-	
+
 	// store confidence levels entered by the learner
 	if (assessment.isEnableConfidenceLevels()) {
 	    questionResult.setConfidenceLevel(questionDto.getConfidenceLevel());
@@ -722,7 +725,8 @@
 			    java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.UNICODE_CASE);
 		}
 		boolean isAnswerMatchedCurrentOption = (questionDto.getAnswerString() != null)
-			? pattern.matcher(questionDto.getAnswerString().trim()).matches() : false;
+			? pattern.matcher(questionDto.getAnswerString().trim()).matches()
+			: false;
 
 		if (isAnswerMatchedCurrentOption) {
 		    mark = optionDto.getGrade() * maxMark;
@@ -738,7 +742,8 @@
 		    boolean isAnswerMatchedCurrentOption = false;
 		    try {
 			float answerFloat = Float.valueOf(questionDto.getAnswerString());
-			isAnswerMatchedCurrentOption = ((answerFloat >= (optionDto.getOptionFloat() - optionDto.getAcceptedError()))
+			isAnswerMatchedCurrentOption = ((answerFloat >= (optionDto.getOptionFloat()
+				- optionDto.getAcceptedError()))
 				&& (answerFloat <= (optionDto.getOptionFloat() + optionDto.getAcceptedError())));
 		    } catch (Exception e) {
 		    }
@@ -756,7 +761,8 @@
 				    answerFloat = answerFloat / unit.getMultiplier();
 				    isAnswerMatchedCurrentOption = ((answerFloat >= (optionDto.getOptionFloat()
 					    - optionDto.getAcceptedError()))
-					    && (answerFloat <= (optionDto.getOptionFloat() + optionDto.getAcceptedError())));
+					    && (answerFloat <= (optionDto.getOptionFloat()
+						    + optionDto.getAcceptedError())));
 				    if (isAnswerMatchedCurrentOption) {
 					break;
 				    }
@@ -774,15 +780,16 @@
 	    }
 
 	} else if (questionDto.getType() == AssessmentConstants.QUESTION_TYPE_TRUE_FALSE) {
-	    if ((questionDto.getAnswerBoolean() == questionDto.getCorrectAnswer()) && (questionDto.getAnswerString() != null)) {
+	    if ((questionDto.getAnswerBoolean() == questionDto.getCorrectAnswer())
+		    && (questionDto.getAnswerString() != null)) {
 		mark = maxMark;
 	    }
 
 	} else if (questionDto.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 	    float maxMarkForCorrectAnswer = maxMark / questionDto.getOptionDtos().size();
-	    TreeSet<OptionDTO> correctOptionSet = new TreeSet<OptionDTO>(new SequencableComparator());
+	    TreeSet<OptionDTO> correctOptionSet = new TreeSet<>(new SequencableComparator());
 	    correctOptionSet.addAll(questionDto.getOptionDtos());
-	    ArrayList<OptionDTO> correctOptionList = new ArrayList<OptionDTO>(correctOptionSet);
+	    ArrayList<OptionDTO> correctOptionList = new ArrayList<>(correctOptionSet);
 	    int i = 0;
 	    for (OptionDTO optionDto : questionDto.getOptionDtos()) {
 		if (optionDto.getUid() == correctOptionList.get(i++).getUid()) {
@@ -951,7 +958,7 @@
 
     @Override
     public List<ReflectDTO> getReflectList(Long contentId) {
-	List<ReflectDTO> reflectList = new LinkedList<ReflectDTO>();
+	List<ReflectDTO> reflectList = new LinkedList<>();
 
 	List<AssessmentSession> sessionList = assessmentSessionDao.getByContentId(contentId);
 	for (AssessmentSession session : sessionList) {
@@ -1002,22 +1009,28 @@
 
     @Override
     public List<SessionDTO> getSessionDtos(Long contentId, boolean includeStatistics) {
-	List<SessionDTO> sessionDtos = new ArrayList<SessionDTO>();
+	List<SessionDTO> sessionDtos = new ArrayList<>();
 
 	List<AssessmentSession> sessionList = assessmentSessionDao.getByContentId(contentId);
 	for (AssessmentSession session : sessionList) {
 	    Long sessionId = session.getSessionId();
 	    SessionDTO sessionDto = new SessionDTO(sessionId, session.getSessionName());
 
 	    //for statistics tab
-	    if ( includeStatistics ) {
+	    if (includeStatistics) {
 		int countUsers = assessmentUserDao.getCountUsersBySession(sessionId, "");
 		sessionDto.setNumberLearners(countUsers);
 		Object[] markStats = assessmentUserDao.getStatsMarksBySession(sessionId);
-		if ( markStats != null ) {
-		    sessionDto.setMinMark(markStats[0] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[0], (Locale)null, 2) : "0.00");
-		    sessionDto.setAvgMark(markStats[1] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[1], (Locale)null, 2) : "0.00");
-		    sessionDto.setMaxMark(markStats[2] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[2], (Locale)null, 2) : "0.00");
+		if (markStats != null) {
+		    sessionDto.setMinMark(markStats[0] != null
+			    ? NumberUtil.formatLocalisedNumber((Float) markStats[0], (Locale) null, 2)
+			    : "0.00");
+		    sessionDto.setAvgMark(markStats[1] != null
+			    ? NumberUtil.formatLocalisedNumber((Float) markStats[1], (Locale) null, 2)
+			    : "0.00");
+		    sessionDto.setMaxMark(markStats[2] != null
+			    ? NumberUtil.formatLocalisedNumber((Float) markStats[2], (Locale) null, 2)
+			    : "0.00");
 		}
 	    }
 
@@ -1031,20 +1044,26 @@
     public LeaderResultsDTO getLeaderResultsDTOForLeaders(Long contentId) {
 	LeaderResultsDTO newDto = new LeaderResultsDTO(contentId);
 	Object[] markStats = assessmentUserDao.getStatsMarksForLeaders(contentId);
-	if ( markStats != null ) {
-	    newDto.setMinMark(markStats[0] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[0], (Locale)null, 2) : "0.00");
-	    newDto.setAvgMark(markStats[1] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[1], (Locale)null, 2) : "0.00");
-	    newDto.setMaxMark(markStats[2] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[2], (Locale)null, 2) : "0.00");
-	    newDto.setNumberGroupsLeaderFinished((Integer)markStats[3]);
+	if (markStats != null) {
+	    newDto.setMinMark(
+		    markStats[0] != null ? NumberUtil.formatLocalisedNumber((Float) markStats[0], (Locale) null, 2)
+			    : "0.00");
+	    newDto.setAvgMark(
+		    markStats[1] != null ? NumberUtil.formatLocalisedNumber((Float) markStats[1], (Locale) null, 2)
+			    : "0.00");
+	    newDto.setMaxMark(
+		    markStats[2] != null ? NumberUtil.formatLocalisedNumber((Float) markStats[2], (Locale) null, 2)
+			    : "0.00");
+	    newDto.setNumberGroupsLeaderFinished((Integer) markStats[3]);
 	}
 	return newDto;
     }
-    
+
     @Override
     public AssessmentResultDTO getUserMasterDetail(Long sessionId, Long userId) {
 	AssessmentResultDTO resultDto = new AssessmentResultDTO();
 	resultDto.setSessionId(sessionId);
-	
+
 	AssessmentResult lastFinishedResult = assessmentResultDao.getLastFinishedAssessmentResultByUser(sessionId,
 		userId);
 	if (lastFinishedResult != null) {
@@ -1053,13 +1072,13 @@
 	    Set<AssessmentQuestionResult> questionResults = lastFinishedResult.getQuestionResults();
 
 	    //prepare list of the questions to display in user master detail table, filtering out questions that aren't supposed to be answered
-	    SortedSet<AssessmentQuestionResult> questionResultsToDisplay = new TreeSet<AssessmentQuestionResult>(
+	    SortedSet<AssessmentQuestionResult> questionResultsToDisplay = new TreeSet<>(
 		    new AssessmentQuestionResultComparator());
 	    //in case there is at least one random question - we need to show all questions
 	    if (assessment.hasRandomQuestion()) {
 		questionResultsToDisplay.addAll(questionResults);
 
-	    //otherwise show only questions from the question list
+		//otherwise show only questions from the question list
 	    } else {
 		for (QuestionReference reference : questionReferences) {
 		    for (AssessmentQuestionResult questionResult : questionResults) {
@@ -1082,7 +1101,7 @@
     @Override
     public UserSummary getUserSummary(Long contentId, Long userId, Long sessionId) {
 	Assessment assessment = assessmentDao.getByContentId(contentId);
-	
+
 	UserSummary userSummary = new UserSummary();
 	AssessmentUser user = assessmentUserDao.getUserByUserIDAndSessionID(userId, sessionId);
 	userSummary.setUser(user);
@@ -1097,11 +1116,11 @@
 	if (lastFinishedResult != null) {
 	    userSummary.setLastAttemptGrade(lastFinishedResult.getGrade());
 	}
-	
+
 	if (!results.isEmpty()) {
 
 	    //prepare list of the questions to display, filtering out questions that aren't supposed to be answered
-	    Set<AssessmentQuestion> questions = new TreeSet<AssessmentQuestion>();
+	    Set<AssessmentQuestion> questions = new TreeSet<>();
 	    //in case there is at least one random question - we need to show all questions in a drop down select
 	    if (assessment.hasRandomQuestion()) {
 		questions.addAll(assessment.getQuestions());
@@ -1114,12 +1133,12 @@
 	    }
 
 	    //prepare list of UserSummaryItems
-	    ArrayList<UserSummaryItem> userSummaryItems = new ArrayList<UserSummaryItem>();
+	    ArrayList<UserSummaryItem> userSummaryItems = new ArrayList<>();
 	    for (AssessmentQuestion question : questions) {
 		UserSummaryItem userSummaryItem = new UserSummaryItem(question);
 
 		//find all questionResults that correspond to the current question
-		List<AssessmentQuestionResult> questionResults = new ArrayList<AssessmentQuestionResult>();
+		List<AssessmentQuestionResult> questionResults = new ArrayList<>();
 		for (AssessmentResult result : results) {
 		    for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
 			if (question.getUid().equals(questionResult.getAssessmentQuestion().getUid())) {
@@ -1154,27 +1173,27 @@
 
     @Override
     public Map<Long, QuestionSummary> getQuestionSummaryForExport(Assessment assessment) {
-	Map<Long, QuestionSummary> questionSummaries = new LinkedHashMap<Long, QuestionSummary>();
+	Map<Long, QuestionSummary> questionSummaries = new LinkedHashMap<>();
 
 	if (assessment.getQuestions() == null) {
 	    return questionSummaries;
 	}
 
-	SortedSet<AssessmentSession> sessions = new TreeSet<AssessmentSession>(new AssessmentSessionComparator());
+	SortedSet<AssessmentSession> sessions = new TreeSet<>(new AssessmentSessionComparator());
 	sessions.addAll(assessmentSessionDao.getByContentId(assessment.getContentId()));
 
 	List<AssessmentResult> assessmentResults = assessmentResultDao
 		.getLastFinishedAssessmentResults(assessment.getContentId());
-	Map<Long, AssessmentResult> userUidToResultMap = new HashMap<Long, AssessmentResult>();
+	Map<Long, AssessmentResult> userUidToResultMap = new HashMap<>();
 	for (AssessmentResult assessmentResult : assessmentResults) {
 	    userUidToResultMap.put(assessmentResult.getUser().getUid(), assessmentResult);
 	}
 
-	Map<Long, List<AssessmentUser>> sessionIdToUsersMap = new HashMap<Long, List<AssessmentUser>>();
+	Map<Long, List<AssessmentUser>> sessionIdToUsersMap = new HashMap<>();
 	for (AssessmentSession session : sessions) {
 
 	    Long sessionId = session.getSessionId();
-	    List<AssessmentUser> users = new ArrayList<AssessmentUser>();
+	    List<AssessmentUser> users = new ArrayList<>();
 
 	    // in case of leader aware tool show only leaders' responses
 	    if (assessment.isUseSelectLeaderToolOuput()) {
@@ -1194,14 +1213,14 @@
 	    QuestionSummary questionSummary = new QuestionSummary();
 	    questionSummary.setQuestion(question);
 
-	    List<List<AssessmentQuestionResult>> questionResults = new ArrayList<List<AssessmentQuestionResult>>();
+	    List<List<AssessmentQuestionResult>> questionResults = new ArrayList<>();
 
 	    for (AssessmentSession session : sessions) {
 
 		Long sessionId = session.getSessionId();
 		List<AssessmentUser> users = sessionIdToUsersMap.get(sessionId);
 
-		ArrayList<AssessmentQuestionResult> sessionQuestionResults = new ArrayList<AssessmentQuestionResult>();
+		ArrayList<AssessmentQuestionResult> sessionQuestionResults = new ArrayList<>();
 		for (AssessmentUser user : users) {
 		    AssessmentResult assessmentResult = userUidToResultMap.get(user.getUid());
 		    AssessmentQuestionResult questionResult = null;
@@ -1250,12 +1269,12 @@
     @Override
     public LinkedHashMap<String, ExcelCell[][]> exportSummary(Assessment assessment, List<SessionDTO> sessionDtos,
 	    boolean showUserNames) {
-	LinkedHashMap<String, ExcelCell[][]> dataToExport = new LinkedHashMap<String, ExcelCell[][]>();
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = new LinkedHashMap<>();
 	final ExcelCell[] EMPTY_ROW = new ExcelCell[0];
 
 	// -------------- First tab: Summary ----------------------------------------------------
 	if (showUserNames) {
-	    ArrayList<ExcelCell[]> summaryTab = new ArrayList<ExcelCell[]>();
+	    ArrayList<ExcelCell[]> summaryTab = new ArrayList<>();
 
 	    if (sessionDtos != null) {
 		for (SessionDTO sessionDTO : sessionDtos) {
@@ -1266,8 +1285,8 @@
 		    ExcelCell[] sessionTitle = new ExcelCell[1];
 		    sessionTitle[0] = new ExcelCell(sessionDTO.getSessionName(), true);
 		    summaryTab.add(sessionTitle);
-		    
-		    List<AssessmentUserDTO> userDtos = new ArrayList<AssessmentUserDTO>();
+
+		    List<AssessmentUserDTO> userDtos = new ArrayList<>();
 		    // in case of UseSelectLeaderToolOuput - display only one user
 		    if (assessment.isUseSelectLeaderToolOuput()) {
 
@@ -1293,12 +1312,15 @@
 			userDtos = getPagedUsersBySession(sessionId, 0, countSessionUsers, "userName", "ASC", "");
 		    }
 
-		    ArrayList<ExcelCell[]> summaryTabLearnerList = new ArrayList<ExcelCell[]>();
-			    
+		    ArrayList<ExcelCell[]> summaryTabLearnerList = new ArrayList<>();
+
 		    ExcelCell[] summaryRowTitle = new ExcelCell[3];
-		    summaryRowTitle[0] = new ExcelCell(getMessage("label.export.user.id"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-		    summaryRowTitle[1] = new ExcelCell(getMessage("label.monitoring.summary.user.name"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-		    summaryRowTitle[2] = new ExcelCell(getMessage("label.monitoring.summary.total"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+		    summaryRowTitle[0] = new ExcelCell(getMessage("label.export.user.id"), true,
+			    ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+		    summaryRowTitle[1] = new ExcelCell(getMessage("label.monitoring.summary.user.name"), true,
+			    ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+		    summaryRowTitle[2] = new ExcelCell(getMessage("label.monitoring.summary.total"), true,
+			    ExcelCell.BORDER_STYLE_BOTTOM_THIN);
 		    summaryTabLearnerList.add(summaryRowTitle);
 
 		    float minGrade = -9999999;
@@ -1313,18 +1335,22 @@
 			userResultRow[2] = new ExcelCell(grade, false);
 			summaryTabLearnerList.add(userResultRow);
 
-			if ( grade < minGrade || minGrade == -9999999  )
+			if (grade < minGrade || minGrade == -9999999) {
 			    minGrade = grade;
-			if ( grade > maxGrade )
+			}
+			if (grade > maxGrade) {
 			    maxGrade = grade;
+			}
 		    }
-		    if ( minGrade == -9999999)
+		    if (minGrade == -9999999) {
 			minGrade = 0;
+		    }
 
-		    LinkedHashMap<String, Integer> markSummary = getMarksSummaryForSession(userDtos, minGrade, maxGrade, 10);
+		    LinkedHashMap<String, Integer> markSummary = getMarksSummaryForSession(userDtos, minGrade, maxGrade,
+			    10);
 		    // work out total marks so we can do percentages. need as float for the correct divisions
 		    int totalNumEntries = 0;
-		    for ( Map.Entry<String, Integer> entry : markSummary.entrySet() ) {
+		    for (Map.Entry<String, Integer> entry : markSummary.entrySet()) {
 			totalNumEntries += entry.getValue();
 		    }
 
@@ -1336,25 +1362,29 @@
 		    summaryTab.add(minMaxRow);
 		    minMaxRow = new ExcelCell[2];
 		    minMaxRow[0] = new ExcelCell(getMessage("label.lowest.mark"), true);
-		    minMaxRow[1] = new ExcelCell((double)minGrade, false);
+		    minMaxRow[1] = new ExcelCell((double) minGrade, false);
 		    summaryTab.add(minMaxRow);
 		    minMaxRow = new ExcelCell[2];
 		    minMaxRow[0] = new ExcelCell(getMessage("label.highest.mark"), true);
-		    minMaxRow[1] = new ExcelCell((double)maxGrade, false);
+		    minMaxRow[1] = new ExcelCell((double) maxGrade, false);
 		    summaryTab.add(minMaxRow);
-		    
+
 		    summaryTab.add(EMPTY_ROW);
 		    ExcelCell[] binSummaryRow = new ExcelCell[3];
-		    binSummaryRow[0] = new ExcelCell(getMessage("label.authoring.basic.list.header.mark"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-		    binSummaryRow[1] = new ExcelCell(getMessage("label.number.learners"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-		    binSummaryRow[2] = new ExcelCell(getMessage("label.percentage"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+		    binSummaryRow[0] = new ExcelCell(getMessage("label.authoring.basic.list.header.mark"), true,
+			    ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+		    binSummaryRow[1] = new ExcelCell(getMessage("label.number.learners"), true,
+			    ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+		    binSummaryRow[2] = new ExcelCell(getMessage("label.percentage"), true,
+			    ExcelCell.BORDER_STYLE_BOTTOM_THIN);
 		    summaryTab.add(binSummaryRow);
-		    float totalNumEntriesAsFloat = (float) totalNumEntries; 
-		    for ( Map.Entry<String, Integer> entry : markSummary.entrySet() ) {
+		    float totalNumEntriesAsFloat = totalNumEntries;
+		    for (Map.Entry<String, Integer> entry : markSummary.entrySet()) {
 			binSummaryRow = new ExcelCell[3];
-			binSummaryRow[0] = new ExcelCell(entry.getKey(),false);
-			binSummaryRow[1] = new ExcelCell(entry.getValue(),false);
-			binSummaryRow[2] = new ExcelCell(Math.round(entry.getValue() / totalNumEntriesAsFloat * 100),false);
+			binSummaryRow[0] = new ExcelCell(entry.getKey(), false);
+			binSummaryRow[1] = new ExcelCell(entry.getValue(), false);
+			binSummaryRow[2] = new ExcelCell(Math.round(entry.getValue() / totalNumEntriesAsFloat * 100),
+				false);
 			summaryTab.add(binSummaryRow);
 		    }
 		    summaryTab.add(EMPTY_ROW);
@@ -1371,7 +1401,7 @@
 	// ------------------------------------------------------------------
 	// -------------- Second tab: Question Summary ----------------------
 
-	ArrayList<ExcelCell[]> questionSummaryTab = new ArrayList<ExcelCell[]>();
+	ArrayList<ExcelCell[]> questionSummaryTab = new ArrayList<>();
 
 	// Create the question summary
 	ExcelCell[] summaryTitle = new ExcelCell[1];
@@ -1411,13 +1441,13 @@
 		    ExcelCell.BORDER_STYLE_BOTTOM_THIN);
 
 	    int questionNumber = 1;
-	    
+
 	    for (AssessmentQuestion question : questions) {
 		int colsNum = showUserNames ? 10 : 9;
 
 		ExcelCell[] questionTitle = new ExcelCell[1];
-		questionTitle[0] = new ExcelCell(getMessage("label.monitoring.question.summary.question") + " "
-			+ questionNumber++, true);
+		questionTitle[0] = new ExcelCell(
+			getMessage("label.monitoring.question.summary.question") + " " + questionNumber++, true);
 		questionSummaryTab.add(questionTitle);
 
 		// set up the summary table data for the top of the question area.
@@ -1427,16 +1457,16 @@
 			|| question.getType() == AssessmentConstants.QUESTION_TYPE_TRUE_FALSE;
 		// For MC, Numeric & Short Answer Key is optionUid, Value is number of answers
 		// For True/False Key 0 is false and Key 1 is true
-		Map<Long, Integer> summaryOfAnswers = new HashMap<Long, Integer>();
+		Map<Long, Integer> summaryOfAnswers = new HashMap<>();
 		Integer summaryNACount = 0;
 		Long trueKey = 1L;
 		Long falseKey = 0L;
 		if (doSummaryTable) {
 		    questionSummaryTab.add(startSummaryTable(question, summaryOfAnswers, trueKey, falseKey));
 		}
-		
-		ArrayList<ExcelCell[]> questionSummaryTabTemp = new ArrayList<ExcelCell[]>();
 
+		ArrayList<ExcelCell[]> questionSummaryTabTemp = new ArrayList<>();
+
 		//add question title row
 		if (question.getType() == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
 		    count = 0;
@@ -1517,9 +1547,10 @@
 			} else {
 			    userResultRow[count++] = new ExcelCell(
 				    AssessmentEscapeUtils.printResponsesForExcelExport(questionResult), false);
-			    
-			    if ( doSummaryTable ) { 
-				summaryNACount = updateSummaryCounts(question, questionResult, summaryOfAnswers, summaryNACount);
+
+			    if (doSummaryTable) {
+				summaryNACount = updateSummaryCounts(question, questionResult, summaryOfAnswers,
+					summaryNACount);
 			    }
 
 			}
@@ -1547,10 +1578,11 @@
 		}
 
 		if (doSummaryTable) {
-		    questionSummaryTab.add(outputSummaryTable(question, summaryOfAnswers, summaryNACount, trueKey, falseKey));
+		    questionSummaryTab
+			    .add(outputSummaryTable(question, summaryOfAnswers, summaryNACount, trueKey, falseKey));
 		    questionSummaryTab.add(EMPTY_ROW);
 		}
-		
+
 		// Calculating the averages
 		ExcelCell[] averageRow;
 
@@ -1586,7 +1618,7 @@
 		questionSummaryTab.addAll(questionSummaryTabTemp);
 		questionSummaryTab.add(averageRow);
 		questionSummaryTab.add(EMPTY_ROW);
-		
+
 	    }
 
 	}
@@ -1596,24 +1628,29 @@
 	// ------------------------------------------------------------------
 	// -------------- Third tab: User Summary ---------------------------
 
-	ArrayList<ExcelCell[]> userSummaryTab = new ArrayList<ExcelCell[]>();
+	ArrayList<ExcelCell[]> userSummaryTab = new ArrayList<>();
 
 	// Create the question summary
 	ExcelCell[] userSummaryTitle = new ExcelCell[1];
 	userSummaryTitle[0] = new ExcelCell(getMessage("label.export.user.summary"), true);
 	userSummaryTab.add(userSummaryTitle);
 
 	ExcelCell[] summaryRowTitle = new ExcelCell[5];
-	summaryRowTitle[0] = new ExcelCell(getMessage("label.monitoring.question.summary.question"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle[1] = new ExcelCell(getMessage("label.authoring.basic.list.header.type"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle[2] = new ExcelCell(getMessage("label.authoring.basic.penalty.factor"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle[3] = new ExcelCell(getMessage("label.monitoring.question.summary.default.mark"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle[4] = new ExcelCell(getMessage("label.monitoring.question.summary.average.mark"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	summaryRowTitle[0] = new ExcelCell(getMessage("label.monitoring.question.summary.question"), true,
+		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	summaryRowTitle[1] = new ExcelCell(getMessage("label.authoring.basic.list.header.type"), true,
+		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	summaryRowTitle[2] = new ExcelCell(getMessage("label.authoring.basic.penalty.factor"), true,
+		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	summaryRowTitle[3] = new ExcelCell(getMessage("label.monitoring.question.summary.default.mark"), true,
+		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	summaryRowTitle[4] = new ExcelCell(getMessage("label.monitoring.question.summary.average.mark"), true,
+		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
 	userSummaryTab.add(summaryRowTitle);
 	Float totalGradesPossible = new Float(0);
 	Float totalAverage = new Float(0);
 	if (assessment.getQuestionReferences() != null) {
-	    Set<QuestionReference> questionReferences = new TreeSet<QuestionReference>(new SequencableComparator());
+	    Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
 	    questionReferences.addAll(assessment.getQuestionReferences());
 
 	    int randomQuestionsCount = 1;
@@ -1669,7 +1706,7 @@
 	if (sessionDtos != null) {
 	    List<AssessmentResult> assessmentResults = assessmentResultDao
 		    .getLastFinishedAssessmentResults(assessment.getContentId());
-	    Map<Long, AssessmentResult> userUidToResultMap = new HashMap<Long, AssessmentResult>();
+	    Map<Long, AssessmentResult> userUidToResultMap = new HashMap<>();
 	    for (AssessmentResult assessmentResult : assessmentResults) {
 		userUidToResultMap.put(assessmentResult.getUser().getUid(), assessmentResult);
 	    }
@@ -1781,30 +1818,26 @@
 	    summaryTable = new ExcelCell[question.getOptions().size() + 1];
 	    for (AssessmentQuestionOption option : question.getOptions()) {
 		summaryOfAnswers.put(option.getUid(), 0);
-		StringBuilder bldr = new StringBuilder(getMessage("label.authoring.basic.option.answer"))
-			.append(" ")
-			.append(i + 1)
-			.append(" - ");
-		if ( question.getType() == AssessmentConstants.QUESTION_TYPE_NUMERICAL ) {
-		    bldr.append(option.getOptionFloat())
-		    	.append(" +- ")
-		    	.append(option.getAcceptedError());
+		StringBuilder bldr = new StringBuilder(getMessage("label.authoring.basic.option.answer")).append(" ")
+			.append(i + 1).append(" - ");
+		if (question.getType() == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
+		    bldr.append(option.getOptionFloat()).append(" +- ").append(option.getAcceptedError());
 		} else {
 		    bldr.append(option.getOptionString().replaceAll("\\<.*?\\>", ""));
 		}
 		summaryTable[i] = new ExcelCell(bldr.toString(), false);
 		i++;
 	    }
-	    if ( question.getType() == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE ) {
-		summaryTable[i++] = new ExcelCell(getMessage("label.not.answered"), false); 
+	    if (question.getType() == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
+		summaryTable[i++] = new ExcelCell(getMessage("label.not.answered"), false);
 	    } else {
-		summaryTable[i++] = new ExcelCell(getMessage("label.other"), false); 
+		summaryTable[i++] = new ExcelCell(getMessage("label.other"), false);
 	    }
 	} else {
 	    summaryTable = new ExcelCell[3];
 	    summaryTable[0] = new ExcelCell(getMessage("label.authoring.true.false.true"), false);
 	    summaryTable[1] = new ExcelCell(getMessage("label.authoring.true.false.false"), false);
-	    summaryTable[2] = new ExcelCell(getMessage("label.not.answered"), false); 
+	    summaryTable[2] = new ExcelCell(getMessage("label.not.answered"), false);
 	    summaryOfAnswers.put(trueKey, 0);
 	    summaryOfAnswers.put(falseKey, 0);
 	}
@@ -1821,11 +1854,10 @@
 		    if (optionAnswer.getAnswerBoolean()) {
 			Integer currentCount = summaryOfAnswers.get(optionAnswer.getOptionUid());
 			if (currentCount == null) {
-			    log.error("Assessment Export: Unable to count answer in summary, refers to an unexpected option. QuestionResult "
-				    + questionResult.getUid()
-				    + " OptionUid "
-				    + optionAnswer.getOptionUid()
-				    + " question " + question.getUid());
+			    log.error(
+				    "Assessment Export: Unable to count answer in summary, refers to an unexpected option. QuestionResult "
+					    + questionResult.getUid() + " OptionUid " + optionAnswer.getOptionUid()
+					    + " question " + question.getUid());
 			} else {
 			    summaryOfAnswers.put(optionAnswer.getOptionUid(), currentCount + 1);
 			    foundOption = true;
@@ -1842,12 +1874,10 @@
 	    if (submittedUid != null) {
 		Integer currentCount = summaryOfAnswers.get(submittedUid);
 		if (currentCount == null) {
-		    log.error("Assessment Export: Unable to count answer in summary, refers to an unexpected option. QuestionResult "
-			    + questionResult.getUid()
-			    + " submittedOptionUid "
-			    + submittedUid
-			    + " question "
-			    + question.getUid());
+		    log.error(
+			    "Assessment Export: Unable to count answer in summary, refers to an unexpected option. QuestionResult "
+				    + questionResult.getUid() + " submittedOptionUid " + submittedUid + " question "
+				    + question.getUid());
 		} else {
 		    summaryOfAnswers.put(submittedUid, currentCount + 1);
 		}
@@ -1868,39 +1898,38 @@
 
     private String valueAsPercentage(Integer value, int total) {
 	Double percentage = (double) value / total * 100;
-	return NumberUtil.formatLocalisedNumber(percentage, (Locale)null, 2) + "%";
-    } 
-    
+	return NumberUtil.formatLocalisedNumber(percentage, (Locale) null, 2) + "%";
+    }
+
     private ExcelCell[] outputSummaryTable(AssessmentQuestion question, Map<Long, Integer> summaryOfAnswers,
 	    Integer summaryNACount, Long trueKey, Long falseKey) {
-	ExcelCell[] summaryTable = new ExcelCell[summaryOfAnswers.size()+1];
+	ExcelCell[] summaryTable = new ExcelCell[summaryOfAnswers.size() + 1];
 	int total = summaryNACount;
-	for ( int value : summaryOfAnswers.values() ) {
-	total += value;
+	for (int value : summaryOfAnswers.values()) {
+	    total += value;
 	}
 	int i = 0;
 	if (question.getType() == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE
 		|| question.getType() == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER
-		|| question.getType() == AssessmentConstants.QUESTION_TYPE_NUMERICAL ) {
-	for (AssessmentQuestionOption option : question.getOptions()) {
-	    summaryTable[i] = new ExcelCell(valueAsPercentage(summaryOfAnswers.get(option.getUid()), total), false);
-	    if ( option.getGrade() > 0 ) {
-		summaryTable[i].setColor(IndexedColors.GREEN);
+		|| question.getType() == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
+	    for (AssessmentQuestionOption option : question.getOptions()) {
+		summaryTable[i] = new ExcelCell(valueAsPercentage(summaryOfAnswers.get(option.getUid()), total), false);
+		if (option.getGrade() > 0) {
+		    summaryTable[i].setColor(IndexedColors.GREEN);
+		}
+		i++;
 	    }
-	    i++;
-	}
-	summaryTable[i++] = new ExcelCell(valueAsPercentage(summaryNACount, total), false);
+	    summaryTable[i++] = new ExcelCell(valueAsPercentage(summaryNACount, total), false);
 	} else {
-	summaryTable = new ExcelCell[3];
-	summaryTable[0] = new ExcelCell(valueAsPercentage(summaryOfAnswers.get(trueKey), total), false);
-	summaryTable[1] = new ExcelCell(valueAsPercentage(summaryOfAnswers.get(falseKey), total), false);
-	summaryTable[2] = new ExcelCell(valueAsPercentage(summaryNACount,total), false);
-	summaryTable[question.getCorrectAnswer() ? 0 : 1].setColor(IndexedColors.GREEN);
+	    summaryTable = new ExcelCell[3];
+	    summaryTable[0] = new ExcelCell(valueAsPercentage(summaryOfAnswers.get(trueKey), total), false);
+	    summaryTable[1] = new ExcelCell(valueAsPercentage(summaryOfAnswers.get(falseKey), total), false);
+	    summaryTable[2] = new ExcelCell(valueAsPercentage(summaryNACount, total), false);
+	    summaryTable[question.getCorrectAnswer() ? 0 : 1].setColor(IndexedColors.GREEN);
 	}
 	return summaryTable;
     }
 
- 
     /**
      * Used only for excell export (for getUserSummaryData() method).
      */
@@ -1941,11 +1970,11 @@
 
 	// When changing a mark for user and isUseSelectLeaderToolOuput is true, the mark should be propagated to all
 	// students within the group
-	List<AssessmentUser> users = new ArrayList<AssessmentUser>();
+	List<AssessmentUser> users = new ArrayList<>();
 	if (assessment.isUseSelectLeaderToolOuput()) {
 	    users = getUsersBySession(toolSessionId);
 	} else {
-	    users = new ArrayList<AssessmentUser>();
+	    users = new ArrayList<>();
 	    AssessmentUser user = assessmentResult.getUser();
 	    users.add(user);
 	}
@@ -1989,7 +2018,7 @@
 	    List<QuestionReference> deletedReferences) {
 
 	// create list of modified questions
-	List<AssessmentQuestion> modifiedQuestions = new ArrayList<AssessmentQuestion>();
+	List<AssessmentQuestion> modifiedQuestions = new ArrayList<>();
 	for (AssessmentQuestion oldQuestion : oldQuestions) {
 	    for (AssessmentQuestion newQuestion : newQuestions) {
 		if (oldQuestion.getUid().equals(newQuestion.getUid())) {
@@ -2035,7 +2064,7 @@
 
 	// create list of modified references
 	// modifiedReferences holds pairs newReference -> oldReference.getDefaultGrade()
-	Map<QuestionReference, Integer> modifiedReferences = new HashMap<QuestionReference, Integer>();
+	Map<QuestionReference, Integer> modifiedReferences = new HashMap<>();
 	for (QuestionReference oldReference : oldReferences) {
 	    for (QuestionReference newReference : newReferences) {
 		if (oldReference.getUid().equals(newReference.getUid())
@@ -2046,7 +2075,7 @@
 	}
 
 	// create list of added references
-	List<QuestionReference> addedReferences = new ArrayList<QuestionReference>();
+	List<QuestionReference> addedReferences = new ArrayList<>();
 	for (QuestionReference newReference : newReferences) {
 	    boolean isNewReferenceMetInOldReferences = false;
 
@@ -2074,7 +2103,7 @@
 			user.getUserId());
 		AssessmentResult lastFinishedAssessmentResult = (assessmentResults.isEmpty()) ? null
 			: assessmentResults.get(assessmentResults.size() - 1);
-		
+
 		//add autosave assessmentResult as well
 		AssessmentResult lastAssessmentResult = getLastAssessmentResult(assessment.getUid(), user.getUserId());
 		if (lastAssessmentResult != null && lastAssessmentResult.getFinishDate() == null) {
@@ -2155,7 +2184,7 @@
 		    }
 
 		    // find all question answers from random question reference
-		    ArrayList<AssessmentQuestionResult> nonRandomQuestionAnswers = new ArrayList<AssessmentQuestionResult>();
+		    ArrayList<AssessmentQuestionResult> nonRandomQuestionAnswers = new ArrayList<>();
 		    for (AssessmentQuestionResult questionAnswer : questionAnswers) {
 			for (QuestionReference reference : newReferences) {
 			    if (!reference.isRandomQuestion() && questionAnswer.getAssessmentQuestion().getUid()
@@ -2263,7 +2292,7 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
 	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
@@ -2289,7 +2318,7 @@
 	String message = messageService.getMessage("event.learner.completes.attempt.body", new Object[] { userName });
 	eventNotificationService.notifyLessonMonitors(sessionId, message, false);
     }
-    
+
     @Override
     public List<Number> getMarksArray(Long sessionId) {
 	return assessmentUserDao.getRawUserMarksBySession(sessionId);
@@ -2300,66 +2329,70 @@
 	return assessmentUserDao.getRawLeaderMarksByToolContentId(toolContentId);
     }
 
-    private LinkedHashMap<String, Integer> getMarksSummaryForSession(List<AssessmentUserDTO> userDtos, float minGrade, float maxGrade, Integer numBuckets) {
+    private LinkedHashMap<String, Integer> getMarksSummaryForSession(List<AssessmentUserDTO> userDtos, float minGrade,
+	    float maxGrade, Integer numBuckets) {
 
-	LinkedHashMap<String, Integer> summary = new LinkedHashMap<String, Integer>();
-	TreeMap<Integer, Integer> inProgress = new TreeMap<Integer, Integer>();
-	
-	if ( numBuckets == null )
+	LinkedHashMap<String, Integer> summary = new LinkedHashMap<>();
+	TreeMap<Integer, Integer> inProgress = new TreeMap<>();
+
+	if (numBuckets == null) {
 	    numBuckets = 10;
-	
+	}
+
 	int bucketSize = 1;
-	int intMinGrade = (int)Math.floor(minGrade);
+	int intMinGrade = (int) Math.floor(minGrade);
 	float gradeDifference = maxGrade - minGrade;
-	if ( gradeDifference <= 10 ) {
-	    for ( int i= intMinGrade; i <= (int)Math.ceil(maxGrade); i++ ) {
+	if (gradeDifference <= 10) {
+	    for (int i = intMinGrade; i <= (int) Math.ceil(maxGrade); i++) {
 		inProgress.put(i, 0);
 	    }
 	} else {
 	    int intGradeDifference = (int) Math.ceil(gradeDifference);
-	    bucketSize = (int) Math.ceil(intGradeDifference / numBuckets); 
-	    for ( int i=intMinGrade; i <= maxGrade; i = i+bucketSize ) {
+	    bucketSize = (int) Math.ceil(intGradeDifference / numBuckets);
+	    for (int i = intMinGrade; i <= maxGrade; i = i + bucketSize) {
 		inProgress.put(i, 0);
 	    }
 	}
-	
+
 	for (AssessmentUserDTO userDto : userDtos) {
 	    float grade = userDto.getGrade();
 	    int bucketStart = intMinGrade;
-	    int bucketStop = bucketStart+bucketSize;
+	    int bucketStop = bucketStart + bucketSize;
 	    boolean looking = true;
-	    while ( bucketStart <= maxGrade && looking ) {
-		if ( grade >= bucketStart && grade < bucketStop ) {
+	    while (bucketStart <= maxGrade && looking) {
+		if (grade >= bucketStart && grade < bucketStop) {
 		    inProgress.put(bucketStart, inProgress.get(bucketStart) + 1);
 		    looking = false;
 		} else {
 		    bucketStart = bucketStop;
-		    bucketStop = bucketStart+bucketSize;
+		    bucketStop = bucketStart + bucketSize;
 		}
 	    }
 	}
-	
-	for ( Map.Entry<Integer, Integer> entry : inProgress.entrySet() ) {
+
+	for (Map.Entry<Integer, Integer> entry : inProgress.entrySet()) {
 	    String key;
-	    if ( bucketSize == 1 )
+	    if (bucketSize == 1) {
 		key = entry.getKey().toString();
-	    else {
-		if ( maxGrade >= entry.getKey() && maxGrade <= entry.getKey()+bucketSize-1) {
-		    if ( (int)maxGrade == entry.getKey() )
-			key = NumberUtil.formatLocalisedNumber(maxGrade, (Locale)null, 2);    
-		    else 
+	    } else {
+		if (maxGrade >= entry.getKey() && maxGrade <= entry.getKey() + bucketSize - 1) {
+		    if ((int) maxGrade == entry.getKey()) {
+			key = NumberUtil.formatLocalisedNumber(maxGrade, (Locale) null, 2);
+		    } else {
 			key = new StringBuilder().append(entry.getKey()).append(" - ")
-		    		.append(NumberUtil.formatLocalisedNumber(maxGrade, (Locale)null, 2)).toString();
+				.append(NumberUtil.formatLocalisedNumber(maxGrade, (Locale) null, 2)).toString();
+		    }
 		} else {
-		    key = new StringBuilder().append(entry.getKey()).append(" - ").append(entry.getKey()+bucketSize-.01).toString();
+		    key = new StringBuilder().append(entry.getKey()).append(" - ")
+			    .append(entry.getKey() + bucketSize - .01).toString();
 		}
 	    }
 	    summary.put(key, entry.getValue());
 	}
-	
+
 	return summary;
     }
-    
+
     // *****************************************************************************
     // private methods
     // *****************************************************************************
@@ -2663,7 +2696,7 @@
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return assessmentOutputFactory.getToolOutputs(name, this, toolContentId);
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	List<ConfidenceLevelDTO> confidenceLevelDtos = new ArrayList<ConfidenceLevelDTO>();
@@ -2849,116 +2882,126 @@
 	Date startDate = null;
 	Date finishDate = null;
 	for (AssessmentResult result : results) {
-	    if (startDate == null || (result.getStartDate() != null && result.getStartDate().before(startDate)))
+	    if (startDate == null || (result.getStartDate() != null && result.getStartDate().before(startDate))) {
 		startDate = result.getStartDate();
-	    if (finishDate == null || (result.getFinishDate() != null && result.getFinishDate().after(finishDate)))
+	    }
+	    if (finishDate == null || (result.getFinishDate() != null && result.getFinishDate().after(finishDate))) {
 		finishDate = result.getFinishDate();
+	    }
 	}
 
-	if (learner.isSessionFinished())
+	if (learner.isSessionFinished()) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, finishDate);
-	else
+	} else {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);
+	}
     }
     // ****************** REST methods *************************
 
     /**
      * Rest call to create a new Assessment content. Required fields in toolContentJSON: "title", "instructions",
      * "questions", "firstName", "lastName", "lastName", "questions" and "references".
      *
-     * The questions entry should be a JSONArray containing JSON objects, which in turn must contain "questionTitle",
+     * The questions entry should be a ArrayNode containing JSON objects, which in turn must contain "questionTitle",
      * "questionText", "displayOrder" (Integer), "type" (Integer). If the type is Multiple Choice, Numerical or Matching
-     * Pairs then a JSONArray "answers" is required.
+     * Pairs then a ArrayNode "answers" is required.
      *
-     * The answers entry should be JSONArray containing JSON objects, which in turn must contain "answerText" or
+     * The answers entry should be ArrayNode containing JSON objects, which in turn must contain "answerText" or
      * "answerFloat", "displayOrder" (Integer), "grade" (Integer).
      *
-     * The references entry should be a JSONArray containing JSON objects, which in turn must contain "displayOrder"
+     * The references entry should be a ArrayNode containing JSON objects, which in turn must contain "displayOrder"
      * (Integer), "questionDisplayOrder" (Integer - to match to the question). It may also have "defaultGrade" (Integer)
      * and "randomQuestion" (Boolean)
+     *
+     * @throws IOException
      */
     @SuppressWarnings("unchecked")
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON)
+	    throws IOException {
 
 	Assessment assessment = new Assessment();
 	assessment.setContentId(toolContentID);
-	assessment.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	assessment.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	assessment.setTitle(toolContentJSON.get(RestTags.TITLE).asText());
+	assessment.setInstructions(toolContentJSON.get(RestTags.INSTRUCTIONS).asText());
 	assessment.setCreated(new Date());
 
-	assessment.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	assessment.setReflectInstructions(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
-	assessment.setAllowGradesAfterAttempt(JsonUtil.opt(toolContentJSON, "allowGradesAfterAttempt", Boolean.FALSE));
-	assessment.setAllowHistoryResponses(JsonUtil.opt(toolContentJSON, "allowHistoryResponses", Boolean.FALSE));
+	assessment.setReflectOnActivity(
+		JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	assessment.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	assessment.setAllowGradesAfterAttempt(
+		JsonUtil.optBoolean(toolContentJSON, "allowGradesAfterAttempt", Boolean.FALSE));
+	assessment
+		.setAllowHistoryResponses(JsonUtil.optBoolean(toolContentJSON, "allowHistoryResponses", Boolean.FALSE));
 	assessment.setAllowOverallFeedbackAfterQuestion(
-		JsonUtil.opt(toolContentJSON, "allowOverallFeedbackAfterQuestion", Boolean.FALSE));
-	assessment.setAllowQuestionFeedback(JsonUtil.opt(toolContentJSON, "allowQuestionFeedback", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "allowOverallFeedbackAfterQuestion", Boolean.FALSE));
+	assessment
+		.setAllowQuestionFeedback(JsonUtil.optBoolean(toolContentJSON, "allowQuestionFeedback", Boolean.FALSE));
 	assessment.setAllowRightAnswersAfterQuestion(
-		JsonUtil.opt(toolContentJSON, "allowRightAnswersAfterQuestion", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "allowRightAnswersAfterQuestion", Boolean.FALSE));
 	assessment.setAllowWrongAnswersAfterQuestion(
-		JsonUtil.opt(toolContentJSON, "allowWrongAnswersAfterQuestion", Boolean.FALSE));
-	assessment.setAttemptsAllowed(JsonUtil.opt(toolContentJSON, "attemptsAllows", 1));
+		JsonUtil.optBoolean(toolContentJSON, "allowWrongAnswersAfterQuestion", Boolean.FALSE));
+	assessment.setAttemptsAllowed(JsonUtil.optInt(toolContentJSON, "attemptsAllows", 1));
 	assessment.setDefineLater(false);
-	assessment.setDisplaySummary(JsonUtil.opt(toolContentJSON, "displaySummary", Boolean.FALSE));
+	assessment.setDisplaySummary(JsonUtil.optBoolean(toolContentJSON, "displaySummary", Boolean.FALSE));
 	assessment.setNotifyTeachersOnAttemptCompletion(
-		JsonUtil.opt(toolContentJSON, "notifyTeachersOnAttemptCompletion", Boolean.FALSE));
-	assessment.setNumbered(JsonUtil.opt(toolContentJSON, "numbered", Boolean.TRUE));
-	assessment.setPassingMark(JsonUtil.opt(toolContentJSON, "passingMark", 0));
-	assessment.setQuestionsPerPage(JsonUtil.opt(toolContentJSON, "questionsPerPage", 0));
-	assessment.setReflectInstructions(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, ""));
-	assessment.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	assessment.setShuffled(JsonUtil.opt(toolContentJSON, "shuffled", Boolean.FALSE));
-	assessment.setTimeLimit(JsonUtil.opt(toolContentJSON, "timeLimit", 0));
+		JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnAttemptCompletion", Boolean.FALSE));
+	assessment.setNumbered(JsonUtil.optBoolean(toolContentJSON, "numbered", Boolean.TRUE));
+	assessment.setPassingMark(JsonUtil.optInt(toolContentJSON, "passingMark", 0));
+	assessment.setQuestionsPerPage(JsonUtil.optInt(toolContentJSON, "questionsPerPage", 0));
+	assessment.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, ""));
+	assessment.setReflectOnActivity(
+		JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	assessment.setShuffled(JsonUtil.optBoolean(toolContentJSON, "shuffled", Boolean.FALSE));
+	assessment.setTimeLimit(JsonUtil.optInt(toolContentJSON, "timeLimit", 0));
 	assessment.setUseSelectLeaderToolOuput(
-		JsonUtil.opt(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
 	// submission deadline set in monitoring
 
 	if (toolContentJSON.has("overallFeedback")) {
-	    throw new JSONException(
+	    throw new IOException(
 		    "Assessment Tool does not support Overall Feedback for REST Authoring. " + toolContentJSON);
 	}
 
 	AssessmentUser assessmentUser = getUserByIDAndContent(userID.longValue(), toolContentID);
 	if (assessmentUser == null) {
 	    assessmentUser = new AssessmentUser();
-	    assessmentUser.setFirstName(toolContentJSON.getString("firstName"));
-	    assessmentUser.setLastName(toolContentJSON.getString("lastName"));
-	    assessmentUser.setLoginName(toolContentJSON.getString("loginName"));
+	    assessmentUser.setFirstName(toolContentJSON.get("firstName").asText());
+	    assessmentUser.setLastName(toolContentJSON.get("lastName").asText());
+	    assessmentUser.setLoginName(toolContentJSON.get("loginName").asText());
 	    assessmentUser.setAssessment(assessment);
 	}
 	assessment.setCreatedBy(assessmentUser);
 
 	// **************************** Set the question bank *********************
-	JSONArray questions = toolContentJSON.getJSONArray("questions");
+	ArrayNode questions = JsonUtil.optArray(toolContentJSON, "questions");
 	Set newQuestionSet = assessment.getQuestions(); // the Assessment constructor will set up the collection
-	for (int i = 0; i < questions.length(); i++) {
-	    JSONObject questionJSONData = (JSONObject) questions.get(i);
+	for (JsonNode questionJSONData : questions) {
 	    AssessmentQuestion question = new AssessmentQuestion();
-	    short type = (short) questionJSONData.getInt("type");
+	    short type = JsonUtil.optInt(questionJSONData, "type").shortValue();
 	    question.setType(type);
-	    question.setTitle(questionJSONData.getString(RestTags.QUESTION_TITLE));
-	    question.setQuestion(questionJSONData.getString(RestTags.QUESTION_TEXT));
-	    question.setSequenceId(questionJSONData.getInt(RestTags.DISPLAY_ORDER));
+	    question.setTitle(questionJSONData.get(RestTags.QUESTION_TITLE).asText());
+	    question.setQuestion(questionJSONData.get(RestTags.QUESTION_TEXT).asText());
+	    question.setSequenceId(JsonUtil.optInt(questionJSONData, RestTags.DISPLAY_ORDER));
 
-	    question.setAllowRichEditor(JsonUtil.opt(questionJSONData, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
-	    question.setAnswerRequired(JsonUtil.opt(questionJSONData, "answerRequired", Boolean.FALSE));
-	    question.setCaseSensitive(JsonUtil.opt(questionJSONData, "caseSensitive", Boolean.FALSE));
-	    question.setCorrectAnswer(JsonUtil.opt(questionJSONData, "correctAnswer", Boolean.FALSE));
-	    question.setDefaultGrade(JsonUtil.opt(questionJSONData, "defaultGrade", 1));
-	    question.setFeedback(JsonUtil.opt(questionJSONData, "feedback", (String) null));
-	    question.setFeedbackOnCorrect(JsonUtil.opt(questionJSONData, "feedbackOnCorrect", (String) null));
-	    question.setFeedbackOnIncorrect(JsonUtil.opt(questionJSONData, "feedbackOnIncorrect", (String) null));
-	    question.setFeedbackOnPartiallyCorrect(
-		    JsonUtil.opt(questionJSONData, "feedbackOnPartiallyCorrect", (String) null));
-	    question.setGeneralFeedback(JsonUtil.opt(questionJSONData, "generalFeedback", ""));
-	    question.setMaxWordsLimit(JsonUtil.opt(questionJSONData, "maxWordsLimit", 0));
-	    question.setMinWordsLimit(JsonUtil.opt(questionJSONData, "minWordsLimit", 0));
-	    question.setMultipleAnswersAllowed(JsonUtil.opt(questionJSONData, "multipleAnswersAllowed", Boolean.FALSE));
+	    question.setAllowRichEditor(
+		    JsonUtil.optBoolean(questionJSONData, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
+	    question.setAnswerRequired(JsonUtil.optBoolean(questionJSONData, "answerRequired", Boolean.FALSE));
+	    question.setCaseSensitive(JsonUtil.optBoolean(questionJSONData, "caseSensitive", Boolean.FALSE));
+	    question.setCorrectAnswer(JsonUtil.optBoolean(questionJSONData, "correctAnswer", Boolean.FALSE));
+	    question.setDefaultGrade(JsonUtil.optInt(questionJSONData, "defaultGrade", 1));
+	    question.setFeedback(JsonUtil.optString(questionJSONData, "feedback"));
+	    question.setFeedbackOnCorrect(JsonUtil.optString(questionJSONData, "feedbackOnCorrect"));
+	    question.setFeedbackOnIncorrect(JsonUtil.optString(questionJSONData, "feedbackOnIncorrect"));
+	    question.setFeedbackOnPartiallyCorrect(JsonUtil.optString(questionJSONData, "feedbackOnPartiallyCorrect"));
+	    question.setGeneralFeedback(JsonUtil.optString(questionJSONData, "generalFeedback", ""));
+	    question.setMaxWordsLimit(JsonUtil.optInt(questionJSONData, "maxWordsLimit", 0));
+	    question.setMinWordsLimit(JsonUtil.optInt(questionJSONData, "minWordsLimit", 0));
+	    question.setMultipleAnswersAllowed(
+		    JsonUtil.optBoolean(questionJSONData, "multipleAnswersAllowed", Boolean.FALSE));
 	    question.setIncorrectAnswerNullifiesMark(
-		    JsonUtil.opt(questionJSONData, "incorrectAnswerNullifiesMark", Boolean.FALSE));
-	    question.setPenaltyFactor(Float.parseFloat(JsonUtil.opt(questionJSONData, "penaltyFactor", "0.0")));
+		    JsonUtil.optBoolean(questionJSONData, "incorrectAnswerNullifiesMark", Boolean.FALSE));
+	    question.setPenaltyFactor(JsonUtil.optDouble(questionJSONData, "penaltyFactor", 0.0).floatValue());
 	    // question.setUnits(units); Needed for numerical type question
 
 	    if ((type == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS)
@@ -2967,22 +3010,21 @@
 		    || (type == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING)) {
 
 		if (!questionJSONData.has(RestTags.ANSWERS)) {
-		    throw new JSONException("REST Authoring is missing answers for a question of type " + type
-			    + ". Data:" + toolContentJSON);
+		    throw new IOException("REST Authoring is missing answers for a question of type " + type + ". Data:"
+			    + toolContentJSON);
 		}
 
-		Set<AssessmentQuestionOption> optionList = new LinkedHashSet<AssessmentQuestionOption>();
-		JSONArray optionsData = questionJSONData.getJSONArray(RestTags.ANSWERS);
-		for (int j = 0; j < optionsData.length(); j++) {
-		    JSONObject answerData = (JSONObject) optionsData.get(j);
+		Set<AssessmentQuestionOption> optionList = new LinkedHashSet<>();
+		ArrayNode optionsData = JsonUtil.optArray(questionJSONData, RestTags.ANSWERS);
+		for (JsonNode answerData : optionsData) {
 		    AssessmentQuestionOption option = new AssessmentQuestionOption();
-		    option.setSequenceId(answerData.getInt(RestTags.DISPLAY_ORDER));
-		    option.setGrade(Float.parseFloat(answerData.getString("grade")));
-		    option.setCorrect(Boolean.parseBoolean(JsonUtil.opt(answerData, "correct", "false")));
-		    option.setAcceptedError(Float.parseFloat(JsonUtil.opt(answerData, "acceptedError", "0.0")));
-		    option.setFeedback(JsonUtil.opt(answerData, "feedback", (String) null));
-		    option.setOptionString(JsonUtil.opt(answerData, RestTags.ANSWER_TEXT, (String) null));
-		    option.setOptionFloat(Float.parseFloat(JsonUtil.opt(answerData, "answerFloat", "0.0")));
+		    option.setSequenceId(JsonUtil.optInt(answerData, RestTags.DISPLAY_ORDER));
+		    option.setGrade(answerData.get("grade").floatValue());
+		    option.setCorrect(JsonUtil.optBoolean(answerData, "correct", false));
+		    option.setAcceptedError(JsonUtil.optDouble(answerData, "acceptedError", 0.0).floatValue());
+		    option.setFeedback(JsonUtil.optString(answerData, "feedback"));
+		    option.setOptionString(JsonUtil.optString(answerData, RestTags.ANSWER_TEXT));
+		    option.setOptionFloat(JsonUtil.optDouble(answerData, "answerFloat", 0.0).floatValue());
 		    // option.setQuestion(question); can't find the use for this field yet!
 		    optionList.add(option);
 		}
@@ -2994,23 +3036,23 @@
 	}
 
 	// **************************** Now set up the references to the questions in the bank *********************
-	JSONArray references = toolContentJSON.getJSONArray("references");
+	ArrayNode references = JsonUtil.optArray(toolContentJSON, "references");
 	Set newReferenceSet = assessment.getQuestionReferences(); // the Assessment constructor will set up the
-								  // collection
-	for (int i = 0; i < references.length(); i++) {
-	    JSONObject referenceJSONData = (JSONObject) references.get(i);
+
+	;// collection
+	for (JsonNode referenceJSONData : references) {
 	    QuestionReference reference = new QuestionReference();
 	    reference.setType((short) 0);
-	    reference.setDefaultGrade(JsonUtil.opt(referenceJSONData, "defaultGrade", 1));
-	    reference.setSequenceId(referenceJSONData.getInt(RestTags.DISPLAY_ORDER));
+	    reference.setDefaultGrade(JsonUtil.optInt(referenceJSONData, "defaultGrade", 1));
+	    reference.setSequenceId(JsonUtil.optInt(referenceJSONData, RestTags.DISPLAY_ORDER));
 	    AssessmentQuestion matchingQuestion = matchQuestion(newQuestionSet,
-		    referenceJSONData.getInt("questionDisplayOrder"));
+		    JsonUtil.optInt(referenceJSONData, "questionDisplayOrder"));
 	    if (matchingQuestion == null) {
-		throw new JSONException("Unable to find matching question for displayOrder "
+		throw new IOException("Unable to find matching question for displayOrder "
 			+ referenceJSONData.get("questionDisplayOrder") + ". Data:" + toolContentJSON);
 	    }
 	    reference.setQuestion(matchingQuestion);
-	    reference.setRandomQuestion(JsonUtil.opt(referenceJSONData, "randomQuestion", Boolean.FALSE));
+	    reference.setRandomQuestion(JsonUtil.optBoolean(referenceJSONData, "randomQuestion", Boolean.FALSE));
 	    reference.setTitle(null);
 	    newReferenceSet.add(reference);
 	}
@@ -3032,10 +3074,10 @@
     }
 
     // TODO Implement REST support for all types and then remove checkType method
-    void checkType(short type) throws JSONException {
+    void checkType(short type) throws IOException {
 	if ((type != AssessmentConstants.QUESTION_TYPE_ESSAY)
 		&& (type != AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)) {
-	    throw new JSONException(
+	    throw new IOException(
 		    "Assessment Tool does not support REST Authoring for anything but Essay Type and Multiple Choice. Found type "
 			    + type);
 	}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.assessment.web.action;
 
 import java.io.IOException;
@@ -54,8 +53,6 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionRedirect;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -88,6 +85,9 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Andrey Balan
  */
@@ -98,7 +98,7 @@
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException, IllegalAccessException,
-	    InstantiationException, InvocationTargetException, NoSuchMethodException, JSONException {
+	    InstantiationException, InvocationTargetException, NoSuchMethodException {
 
 	String param = mapping.getParameter();
 	if (param.equals("start")) {
@@ -137,7 +137,7 @@
 	if (param.equals("getSecondsLeft")) {
 	    return getSecondsLeft(mapping, form, request, response);
 	}
-	
+
 	// ================ Reflection =======================
 	if (param.equals("newReflection")) {
 	    return newReflection(mapping, form, request, response);
@@ -161,7 +161,7 @@
 	    InvocationTargetException, NoSuchMethodException {
 
 	// initialize Session Map
-	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 
 	// save toolContentID into HTTPSession
@@ -201,22 +201,25 @@
 
 		return mapping.findForward(AssessmentConstants.WAIT_FOR_LEADER);
 	    }
-	    
+
 	    // forwards to the waitForLeader pages
 	    boolean isNonLeader = !user.getUserId().equals(groupLeader.getUserId());
 	    if (assessment.getTimeLimit() != 0 && isNonLeader && !user.isSessionFinished()) {
-		AssessmentResult lastLeaderResult = service.getLastAssessmentResult(assessment.getUid(), groupLeader.getUserId());
+		AssessmentResult lastLeaderResult = service.getLastAssessmentResult(assessment.getUid(),
+			groupLeader.getUserId());
 
 		//show waitForLeaderLaunchTimeLimit page if the leader hasn't started activity or hasn't pressed OK button to launch time limit
 		if (lastLeaderResult == null || lastLeaderResult.getTimeLimitLaunchedDate() == null) {
-		    request.setAttribute(AssessmentConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader.launch.time.limit");
+		    request.setAttribute(AssessmentConstants.PARAM_WAITING_MESSAGE_KEY,
+			    "label.waiting.for.leader.launch.time.limit");
 		    return mapping.findForward(AssessmentConstants.WAIT_FOR_LEADER_TIME_LIMIT);
-		}		
-		
+		}
+
 		//if the time is up and leader hasn't submitted response - show waitForLeaderFinish page
 		boolean isTimeLimitExceeded = service.checkTimeLimitExceeded(assessment, groupLeader);
 		if (isTimeLimitExceeded && !groupLeader.isSessionFinished()) {
-		    request.setAttribute(AssessmentConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader.finish");
+		    request.setAttribute(AssessmentConstants.PARAM_WAITING_MESSAGE_KEY,
+			    "label.waiting.for.leader.finish");
 		    return mapping.findForward(AssessmentConstants.WAIT_FOR_LEADER_TIME_LIMIT);
 		}
 	    }
@@ -234,10 +237,10 @@
 	boolean isUserLeader = service.isUserGroupLeader(user, new Long(toolSessionId));
 	sessionMap.put(AssessmentConstants.ATTR_IS_USER_LEADER, isUserLeader);
 
-	Set<QuestionReference> questionReferences = new TreeSet<QuestionReference>(new SequencableComparator());
+	Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
 	questionReferences.addAll(assessment.getQuestionReferences());
-	HashMap<Long, AssessmentQuestion> questionToReferenceMap = new HashMap<Long, AssessmentQuestion>();
-	ArrayList<AssessmentQuestion> takenQuestion = new ArrayList<AssessmentQuestion>();
+	HashMap<Long, AssessmentQuestion> questionToReferenceMap = new HashMap<>();
+	ArrayList<AssessmentQuestion> takenQuestion = new ArrayList<>();
 
 	//add non-random questions
 	for (QuestionReference questionReference : questionReferences) {
@@ -292,7 +295,7 @@
 	sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ON, assessment.isReflectOnActivity());
 	sessionMap.put(AssessmentConstants.ATTR_REFLECTION_INSTRUCTION, assessment.getReflectInstructions());
 	sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ENTRY, entryText);
-	
+
 	//time limit
 	boolean isTimeLimitEnabled = hasEditRight && !showResults && assessment.getTimeLimit() != 0;
 	long secondsLeft = isTimeLimitEnabled ? service.getSecondsLeft(assessment, user) : 0;
@@ -328,10 +331,10 @@
 	}
 
 	//sort questions
-	LinkedList<QuestionDTO> questionDtos = new LinkedList<QuestionDTO>();
+	LinkedList<QuestionDTO> questionDtos = new LinkedList<>();
 	for (QuestionReference questionReference : questionReferences) {
 	    AssessmentQuestion question = questionToReferenceMap.get(questionReference.getUid());
-	    
+
 	    QuestionDTO questionDto = question.getQuestionDTO();
 	    questionDto.setGrade(questionReference.getDefaultGrade());
 
@@ -340,45 +343,45 @@
 
 	// shuffling
 	if (assessment.isShuffled()) {
-	    ArrayList<QuestionDTO> shuffledList = new ArrayList<QuestionDTO>(questionDtos);
+	    ArrayList<QuestionDTO> shuffledList = new ArrayList<>(questionDtos);
 	    Collections.shuffle(shuffledList);
-	    questionDtos = new LinkedList<QuestionDTO>(shuffledList);
+	    questionDtos = new LinkedList<>(shuffledList);
 	}
-	for (QuestionDTO questionDto : questionDtos) {	    
+	for (QuestionDTO questionDto : questionDtos) {
 	    if (questionDto.isShuffle() || (questionDto.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING)) {
-		ArrayList<OptionDTO> shuffledList = new ArrayList<OptionDTO>(questionDto.getOptionDtos());
+		ArrayList<OptionDTO> shuffledList = new ArrayList<>(questionDto.getOptionDtos());
 		Collections.shuffle(shuffledList);
-		questionDto.setOptionDtos(new LinkedHashSet<OptionDTO>(shuffledList));
+		questionDto.setOptionDtos(new LinkedHashSet<>(shuffledList));
 	    }
 	    if (questionDto.getType() == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) {
 		//sort answer options alphanumerically (as per LDEV-4326)
-		ArrayList<OptionDTO> optionsSortedByOptionString = new ArrayList<OptionDTO>(
-			questionDto.getOptionDtos());
+		ArrayList<OptionDTO> optionsSortedByOptionString = new ArrayList<>(questionDto.getOptionDtos());
 		optionsSortedByOptionString.sort(new Comparator<OptionDTO>() {
 		    @Override
 		    public int compare(OptionDTO o1, OptionDTO o2) {
 			String optionString1 = o1.getOptionString() != null ? o1.getOptionString() : "";
 			String optionString2 = o2.getOptionString() != null ? o2.getOptionString() : "";
-			
+
 			return AlphanumComparator.compareAlphnumerically(optionString1, optionString2);
 		    }
 		});
-		questionDto.setMatchingPairOptions(new LinkedHashSet<OptionDTO>(optionsSortedByOptionString));
+		questionDto.setMatchingPairOptions(new LinkedHashSet<>(optionsSortedByOptionString));
 	    }
 	}
 
 	//paging
-	List<Set<QuestionDTO>> pagedQuestionDtos = new ArrayList<Set<QuestionDTO>>();
+	List<Set<QuestionDTO>> pagedQuestionDtos = new ArrayList<>();
 	int maxQuestionsPerPage = ((assessment.getQuestionsPerPage() != 0) && hasEditRight)
-		? assessment.getQuestionsPerPage() : questionDtos.size();
-	LinkedHashSet<QuestionDTO> questionsForOnePage = new LinkedHashSet<QuestionDTO>();
+		? assessment.getQuestionsPerPage()
+		: questionDtos.size();
+	LinkedHashSet<QuestionDTO> questionsForOnePage = new LinkedHashSet<>();
 	pagedQuestionDtos.add(questionsForOnePage);
 	int count = 0;
 	for (QuestionDTO questionDto : questionDtos) {
 	    questionsForOnePage.add(questionDto);
 	    count++;
 	    if ((questionsForOnePage.size() == maxQuestionsPerPage) && (count != questionDtos.size())) {
-		questionsForOnePage = new LinkedHashSet<QuestionDTO>();
+		questionsForOnePage = new LinkedHashSet<>();
 		pagedQuestionDtos.add(questionsForOnePage);
 	    }
 	}
@@ -390,7 +393,7 @@
 
 	// loadupLastAttempt for display purpose
 	loadupLastAttempt(sessionMap);
-	
+
 	if (showResults) {
 
 	    // display results page
@@ -406,12 +409,12 @@
 	    return mapping.findForward(AssessmentConstants.LEARNING);
 	}
     }
- 
+
     /**
      * Checks Leader Progress
      */
     private ActionForward checkLeaderProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 
 	IAssessmentService service = getAssessmentService();
 	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -423,32 +426,36 @@
 	boolean isTimeLimitExceeded = service.checkTimeLimitExceeded(session.getAssessment(), leader);
 	boolean isLeaderResponseFinalized = leader.isSessionFinished();
 
-	JSONObject JSONObject = new JSONObject();
-	JSONObject.put("isPageRefreshRequested", isLeaderResponseFinalized || isTimeLimitExceeded);
+	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
+	ObjectNode.put("isPageRefreshRequested", isLeaderResponseFinalized || isTimeLimitExceeded);
 	response.setContentType("application/x-json;charset=utf-8");
-	response.getWriter().print(JSONObject);
+	response.getWriter().print(ObjectNode);
 	return null;
     }
 
     /**
      * Shows next page. It's available only to leaders as non-leaders see all questions on one page.
-     * @throws NoSuchMethodException 
-     * @throws InvocationTargetException 
-     * @throws IllegalAccessException 
+     *
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
      */
     private ActionForward nextPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ServletException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+	    HttpServletResponse response)
+	    throws ServletException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 	return nextPage(mapping, request, false, -1);
     }
-    
+
     /**
      * Auxiliary method to be called by nextPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-     * HttpServletResponse response) or submitAll. 
+     * HttpServletResponse response) or submitAll.
      * 
      * @param mapping
      * @param request
-     * @param isAnswersValidationFailed submitAll() method may set it as true in case some of the pages miss required answers
-     * @param pageNumberWithUnasweredQuestions page number with questions required to be answered
+     * @param isAnswersValidationFailed
+     *            submitAll() method may set it as true in case some of the pages miss required answers
+     * @param pageNumberWithUnasweredQuestions
+     *            page number with questions required to be answered
      * @return
      */
     private ActionForward nextPage(ActionMapping mapping, HttpServletRequest request, boolean isAnswersValidationFailed,
@@ -484,7 +491,7 @@
 	if (showResults) {
 	    request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	    return mapping.findForward(AssessmentConstants.SHOW_RESULTS);
-	    
+
 	} else {
 	    //get user answers from request and store them into sessionMap
 	    storeUserAnswersIntoSessionMap(request, oldPageNumber);
@@ -493,7 +500,7 @@
 
 	    long secondsLeft = service.getSecondsLeft(assessment, user);
 	    sessionMap.put(AssessmentConstants.ATTR_SECONDS_LEFT, secondsLeft);
-	    
+
 	    // use redirect to prevent form resubmission
 	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig(AssessmentConstants.LEARNING));
 	    redirect.addParameter(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
@@ -506,13 +513,14 @@
      * Ajax call to get the remaining seconds. Needed when the page is reloaded in the browser to check with the server
      * what the current values should be! Otherwise the learner can keep hitting reload after a page change or submit
      * all (when questions are spread across pages) and increase their time!
+     * 
      * @return
-     * @throws JSONException 
-     * @throws IOException 
+     * @throws JSONException
+     * @throws IOException
      */
     private ActionForward getSecondsLeft(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response)
-	    throws ServletException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, JSONException, IOException {
+	    HttpServletResponse response) throws ServletException, IllegalAccessException, InvocationTargetException,
+	    NoSuchMethodException, IOException {
 
 	IAssessmentService service = getAssessmentService();
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
@@ -521,21 +529,23 @@
 	Assessment assessment = (Assessment) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT);
 	AssessmentUser user = (AssessmentUser) sessionMap.get(AssessmentConstants.ATTR_USER);
 	long secondsLeft = service.getSecondsLeft(assessment, user);
-	JSONObject JSONObject = new JSONObject();
-	JSONObject.put(AssessmentConstants.ATTR_SECONDS_LEFT, secondsLeft);
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put(AssessmentConstants.ATTR_SECONDS_LEFT, secondsLeft);
 	response.setContentType("application/x-json;charset=utf-8");
-	response.getWriter().print(JSONObject);
-	return null;	    
+	response.getWriter().print(responseJSON);
+	return null;
     }
 
     /**
      * Handling submittion of MarkHedging type of Questions (in case of leader aware tool).
-     * @throws NoSuchMethodException 
-     * @throws InvocationTargetException 
-     * @throws IllegalAccessException 
+     *
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
      */
     private ActionForward submitSingleMarkHedgingQuestion(ActionMapping mapping, ActionForm form,
-	    HttpServletRequest request, HttpServletResponse response) throws ServletException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+	    HttpServletRequest request, HttpServletResponse response)
+	    throws ServletException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 	IAssessmentService service = getAssessmentService();
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -552,7 +562,8 @@
 
 	// store results from sessionMap into DB
 	Long singleMarkHedgingQuestionUid = WebUtil.readLongParam(request, "singleMarkHedgingQuestionUid");
-	boolean isResultsStored = service.storeUserAnswers(assessment, userId, pagedQuestionDtos, singleMarkHedgingQuestionUid, false);
+	boolean isResultsStored = service.storeUserAnswers(assessment, userId, pagedQuestionDtos,
+		singleMarkHedgingQuestionUid, false);
 	// result was not stored in case user was prohibited from submitting (or autosubmitting) answers (e.g. when
 	// using 2 browsers). Then show last stored results
 	if (!isResultsStored) {
@@ -585,12 +596,14 @@
 
     /**
      * Display same entire authoring page content from HttpSession variable.
-     * @throws NoSuchMethodException 
-     * @throws InvocationTargetException 
-     * @throws IllegalAccessException 
+     *
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
      */
     private ActionForward submitAll(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ServletException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+	    HttpServletResponse response)
+	    throws ServletException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
@@ -622,7 +635,7 @@
 
 	// populate info for displaying results page
 	showResults(mapping, sessionMap);
-	
+
 	//use redirect to prevent form resubmission
 	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig(AssessmentConstants.SHOW_RESULTS));
 	redirect.addParameter(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
@@ -645,20 +658,20 @@
 	AssessmentUser assessmentUser = (AssessmentUser) sessionMap.get(AssessmentConstants.ATTR_USER);
 	Long userId = assessmentUser.getUserId();
 	service.unsetSessionFinished(toolSessionId, userId);
-	
+
 	Date lastAttemptStartingDate = service.getLastAssessmentResult(assessment.getUid(), userId).getStartDate();
-	
+
 	// set attempt started: create a new one + mark previous as not being the latest any longer
 	service.setAttemptStarted(assessment, assessmentUser, toolSessionId);
-	
+
 	// in case of content was modified in monitor - redirect to start.do in order to refresh info from the DB
 	if (assessment.isContentModifiedInMonitor(lastAttemptStartingDate)) {
 	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("learningStartMethod"));
 	    redirect.addParameter(AttributeNames.PARAM_MODE, mode.toString());
 	    redirect.addParameter(AssessmentConstants.PARAM_TOOL_SESSION_ID, toolSessionId);
 	    return redirect;
-	
-	//otherwise use data from SessionMap
+
+	    //otherwise use data from SessionMap
 	} else {
 
 	    sessionMap.put(AssessmentConstants.ATTR_SHOW_RESULTS, false);
@@ -743,7 +756,7 @@
 
 	int optionIndex = NumberUtils.stringToInt(request.getParameter(AssessmentConstants.PARAM_OPTION_INDEX), -1);
 	if (optionIndex != -1) {
-	    List<OptionDTO> rList = new ArrayList<OptionDTO>(optionDtoList);
+	    List<OptionDTO> rList = new ArrayList<>(optionDtoList);
 
 	    // get current and the target item, and switch their sequnece
 	    OptionDTO option = rList.remove(optionIndex);
@@ -754,7 +767,7 @@
 	    }
 
 	    // put back list
-	    optionDtoList = new LinkedHashSet<OptionDTO>(rList);
+	    optionDtoList = new LinkedHashSet<>(rList);
 	    questionDto.setOptionDtos(optionDtoList);
 	}
 
@@ -765,12 +778,14 @@
 
     /**
      * auto saves responses
-     * @throws NoSuchMethodException 
-     * @throws InvocationTargetException 
-     * @throws IllegalAccessException 
+     *
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
      */
     private ActionForward autoSaveAnswers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+	    HttpServletResponse response)
+	    throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 	IAssessmentService service = getAssessmentService();
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -784,7 +799,7 @@
 
 	return null;
     }
-    
+
     /**
      * Stores date when user has started activity with time limit
      */
@@ -794,11 +809,11 @@
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
-	
+
 	Long assessmentUid = ((Assessment) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT)).getUid();
 	Long userId = ((AssessmentUser) sessionMap.get(AssessmentConstants.ATTR_USER)).getUserId();
 	sessionMap.put(AssessmentConstants.ATTR_IS_TIME_LIMIT_NOT_LAUNCHED, false);
-	
+
 	service.launchTimeLimit(assessmentUid, userId);
 
 	return null;
@@ -873,7 +888,8 @@
      * Get back user answers from request and store it into sessionMap.
      *
      * @param request
-     * @param pageNumber number of the page to process
+     * @param pageNumber
+     *            number of the page to process
      */
     private void storeUserAnswersIntoSessionMap(HttpServletRequest request, int pageNumber) {
 	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
@@ -999,7 +1015,8 @@
 		int questionType = questionDto.getType();
 
 		//enforce all hedging marks question type to be answered as well
-		if (questionDto.isAnswerRequired() || (questionType == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING)) {
+		if (questionDto.isAnswerRequired()
+			|| (questionType == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING)) {
 
 		    boolean isAnswered = false;
 
@@ -1049,13 +1066,14 @@
 		if ((questionDto.getType() == AssessmentConstants.QUESTION_TYPE_ESSAY)
 			&& (questionDto.getMinWordsLimit() > 0)) {
 
-		    if ( questionDto.getAnswerString() == null ) {
+		    if (questionDto.getAnswerString() == null) {
 			isAllQuestionsReachedMinWordsLimit = false;
 			break;
-			
+
 		    } else {
-			boolean isMinWordsLimitReached = ValidationUtil.isMinWordsLimitReached(questionDto.getAnswerString(),
-				questionDto.getMinWordsLimit(), questionDto.isAllowRichEditor());
+			boolean isMinWordsLimitReached = ValidationUtil.isMinWordsLimitReached(
+				questionDto.getAnswerString(), questionDto.getMinWordsLimit(),
+				questionDto.isAllowRichEditor());
 			// check min words limit is reached
 			if (!isMinWordsLimitReached) {
 			    isAllQuestionsReachedMinWordsLimit = false;
@@ -1084,7 +1102,7 @@
 	Assessment assessment = (Assessment) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT);
 	Long userId = ((AssessmentUser) sessionMap.get(AssessmentConstants.ATTR_USER)).getUserId();
 	IAssessmentService service = getAssessmentService();
-	
+
 	int dbResultCount = service.getAssessmentResultCount(assessment.getUid(), userId);
 	if (dbResultCount > 0) {
 
@@ -1205,7 +1223,7 @@
 			questionDto.setConfidenceLevel(questionResult.getConfidenceLevel());
 
 			for (OptionDTO optionDto : questionDto.getOptionDtos()) {
-			    
+
 			    for (AssessmentOptionAnswer optionAnswer : questionResult.getOptionAnswers()) {
 				if (optionDto.getUid().equals(optionAnswer.getOptionUid())) {
 				    optionDto.setAnswerBoolean(optionAnswer.getAnswerBoolean());
@@ -1217,7 +1235,7 @@
 
 			//sort ordering type of question in order to show how learner has sorted them
 			if (questionDto.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING) {
-			    
+
 			    //don't sort ordering type of questions that haven't been submitted to not break their shuffled order
 			    boolean isOptionAnswersNeverSubmitted = true;
 			    for (OptionDTO optionDto : questionDto.getOptionDtos()) {
@@ -1227,7 +1245,7 @@
 			    }
 
 			    if (!isOptionAnswersNeverSubmitted) {
-				TreeSet<OptionDTO> orderedSet = new TreeSet<OptionDTO>(new AnswerIntComparator());
+				TreeSet<OptionDTO> orderedSet = new TreeSet<>(new AnswerIntComparator());
 				orderedSet.addAll(questionDto.getOptionDtos());
 				questionDto.setOptionDtos(orderedSet);
 			    }
@@ -1253,20 +1271,22 @@
 
     /**
      * Store user answers in DB in last unfinished attempt and notify teachers about it.
-     * @throws NoSuchMethodException 
-     * @throws InvocationTargetException 
-     * @throws IllegalAccessException 
+     *
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
      */
-    private boolean storeUserAnswersIntoDatabase(SessionMap<String, Object> sessionMap, boolean isAutosave) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-	
+    private boolean storeUserAnswersIntoDatabase(SessionMap<String, Object> sessionMap, boolean isAutosave)
+	    throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+
 	List<Set<QuestionDTO>> pagedQuestionDtos = (List<Set<QuestionDTO>>) sessionMap
 		.get(AssessmentConstants.ATTR_PAGED_QUESTION_DTOS);
 	IAssessmentService service = getAssessmentService();
 	Long toolSessionId = (Long) sessionMap.get(AssessmentConstants.ATTR_TOOL_SESSION_ID);
 	Long userId = ((AssessmentUser) sessionMap.get(AssessmentConstants.ATTR_USER)).getUserId();
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 	Assessment assessment = service.getAssessmentBySessionId(toolSessionId);
-	
+
 	boolean isResultsStored = service.storeUserAnswers(assessment, userId, pagedQuestionDtos, null, isAutosave);
 
 	// notify teachers
@@ -1306,8 +1326,8 @@
     private AssessmentUser getSpecifiedUser(IAssessmentService service, Long sessionId, Integer userId) {
 	AssessmentUser assessmentUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId);
 	if (assessmentUser == null) {
-	    LearningAction.log
-		    .error("Unable to find specified user for assessment activity. Screens are likely to fail. SessionId="
+	    LearningAction.log.error(
+		    "Unable to find specified user for assessment activity. Screens are likely to fail. SessionId="
 			    + sessionId + " UserId=" + userId);
 	}
 	return assessmentUser;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
diff -u -r5c770157545dea3dbc72e22a1dd1107c56cf22eb -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.assessment.web.action;
 
 import java.io.IOException;
@@ -47,9 +46,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.gradebook.util.GradebookConstants;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO;
@@ -72,21 +68,26 @@
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.ExcelCell;
 import org.lamsfoundation.lams.util.ExcelUtil;
+import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 public class MonitoringAction extends Action {
     public static Logger log = Logger.getLogger(MonitoringAction.class);
 
     private IAssessmentService service;
 
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, JSONException {
+	    HttpServletResponse response) throws IOException, ServletException {
 	request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
 
 	String param = mapping.getParameter();
@@ -126,7 +127,7 @@
 	if (param.equals("statistic")) {
 	    return statistic(mapping, form, request, response);
 	}
-	
+
 	return mapping.findForward(AssessmentConstants.ERROR);
     }
 
@@ -135,7 +136,7 @@
 	initAssessmentService();
 
 	// initialize Session Map
-	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
@@ -153,7 +154,8 @@
 	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
 	    request.setAttribute(AssessmentConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
 	    // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed
-	    request.setAttribute(AssessmentConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()));
+	    request.setAttribute(AssessmentConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING,
+		    DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()));
 
 	}
 
@@ -165,7 +167,7 @@
 	}
 
 	//prepare list of the questions to display in question drop down menu, filtering out questions that aren't supposed to be answered
-	Set<AssessmentQuestion> questionList = new TreeSet<AssessmentQuestion>();
+	Set<AssessmentQuestion> questionList = new TreeSet<>();
 	//in case there is at least one random question - we need to show all questions in a drop down select
 	if (assessment.hasRandomQuestion()) {
 	    questionList.addAll(assessment.getQuestions());
@@ -178,7 +180,7 @@
 	}
 
 	//prepare toolOutputDefinitions and activityEvaluation
-	List<String> toolOutputDefinitions = new ArrayList<String>();
+	List<String> toolOutputDefinitions = new ArrayList<>();
 	toolOutputDefinitions.add(AssessmentConstants.OUTPUT_NAME_LEARNER_TOTAL_SCORE);
 	toolOutputDefinitions.add(AssessmentConstants.OUTPUT_NAME_BEST_SCORE);
 	toolOutputDefinitions.add(AssessmentConstants.OUTPUT_NAME_FIRST_SCORE);
@@ -198,13 +200,13 @@
 		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
-    
+
     private ActionForward userMasterDetail(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	initAssessmentService();
 	Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
 	Long sessionId = WebUtil.readLongParam(request, AssessmentConstants.PARAM_SESSION_ID);
-	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);	
+	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
 	AssessmentResultDTO result = service.getUserMasterDetail(sessionId, userId);
 
 	request.setAttribute(AssessmentConstants.ATTR_ASSESSMENT_RESULT, result);
@@ -270,7 +272,7 @@
      * @param request
      * @param response
      * @return
-     * @throws IOException 
+     * @throws IOException
      */
     private ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
@@ -311,7 +313,7 @@
      * @throws IOException
      */
     private ActionForward setActivityEvaluation(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	initAssessmentService();
 
 	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
@@ -322,11 +324,11 @@
 	String activityEvaluation = WebUtil.readStrParam(request, AssessmentConstants.ATTR_ACTIVITY_EVALUATION);
 	service.setActivityEvaluation(contentID, activityEvaluation);
 
-	// update the session ready for stats tab to be reloaded otherwise flicking between tabs 
+	// update the session ready for stats tab to be reloaded otherwise flicking between tabs
 	// causes the old value to be redisplayed
 	sessionMap.put(AssessmentConstants.ATTR_ACTIVITY_EVALUATION, activityEvaluation);
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("success", "true");
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().print(new String(responseJSON.toString()));
@@ -337,7 +339,7 @@
      * Refreshes user list.
      */
     public ActionForward getUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	    HttpServletResponse res) throws IOException, ServletException {
 	initAssessmentService();
 	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -356,7 +358,7 @@
 	}
 	String searchString = WebUtil.readStrParam(request, "userName", true);
 
-	List<AssessmentUserDTO> userDtos = new ArrayList<AssessmentUserDTO>();
+	List<AssessmentUserDTO> userDtos = new ArrayList<>();
 	int countSessionUsers = 0;
 	//in case of UseSelectLeaderToolOuput - display only one user
 	if (assessment.isUseSelectLeaderToolOuput()) {
@@ -389,31 +391,32 @@
 		Math.ceil(new Integer(countSessionUsers).doubleValue() / new Integer(rowLimit).doubleValue()))
 			.intValue();
 
-	JSONArray rows = new JSONArray();
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
 	int i = 1;
 	for (AssessmentUserDTO userDto : userDtos) {
 
-	    JSONArray userData = new JSONArray();
-	    userData.put(userDto.getUserId());
-	    userData.put(sessionId);
+	    ArrayNode userData = JsonNodeFactory.instance.arrayNode();
+	    userData.add(userDto.getUserId());
+	    userData.add(sessionId);
 	    String fullName = StringEscapeUtils.escapeHtml(userDto.getFirstName() + " " + userDto.getLastName());
-	    userData.put(fullName);
-	    userData.put(userDto.getGrade());
-	    if (userDto.getPortraitId() != null ) 
-		userData.put(userDto.getPortraitId());
+	    userData.add(fullName);
+	    userData.add(userDto.getGrade());
+	    if (userDto.getPortraitId() != null) {
+		userData.add(userDto.getPortraitId());
+	    }
 
-	    JSONObject userRow = new JSONObject();
+	    ObjectNode userRow = JsonNodeFactory.instance.objectNode();
 	    userRow.put("id", i++);
-	    userRow.put("cell", userData);
+	    userRow.set("cell", userData);
 
-	    rows.put(userRow);
+	    rows.add(userRow);
 	}
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("total", totalPages);
 	responseJSON.put("page", page);
 	responseJSON.put("records", countSessionUsers);
-	responseJSON.put("rows", rows);
+	responseJSON.set("rows", rows);
 
 	res.setContentType("application/json;charset=utf-8");
 	res.getWriter().print(new String(responseJSON.toString()));
@@ -424,7 +427,7 @@
      * Refreshes user list.
      */
     public ActionForward getUsersByQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	    HttpServletResponse res) throws IOException, ServletException {
 	initAssessmentService();
 	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -444,7 +447,7 @@
 	}
 	String searchString = WebUtil.readStrParam(request, "userName", true);
 
-	List<AssessmentUserDTO> userDtos = new ArrayList<AssessmentUserDTO>();
+	List<AssessmentUserDTO> userDtos = new ArrayList<>();
 	int countSessionUsers = 0;
 	//in case of UseSelectLeaderToolOuput - display only one user
 	if (assessment.isUseSelectLeaderToolOuput()) {
@@ -485,64 +488,65 @@
 		Math.ceil(new Integer(countSessionUsers).doubleValue() / new Integer(rowLimit).doubleValue()))
 			.intValue();
 
-	JSONArray rows = new JSONArray();
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
 	int i = 1;
 	for (AssessmentUserDTO userDto : userDtos) {
 
 	    Long questionResultUid = userDto.getQuestionResultUid();
 	    String fullName = StringEscapeUtils.escapeHtml(userDto.getFirstName() + " " + userDto.getLastName());
 
-	    JSONArray userData = new JSONArray();
+	    ArrayNode userData = JsonNodeFactory.instance.arrayNode();
 	    if (questionResultUid != null) {
 		AssessmentQuestionResult questionResult = service.getAssessmentQuestionResultByUid(questionResultUid);
 
-		userData.put(questionResultUid);
-		userData.put(questionResult.getMaxMark());
-		userData.put(fullName);
-		userData.put(AssessmentEscapeUtils.printResponsesForJqgrid(questionResult));
-		// show confidence levels if this feature is turned ON 
+		userData.add(questionResultUid);
+		userData.add(questionResult.getMaxMark());
+		userData.add(fullName);
+		userData.add(AssessmentEscapeUtils.printResponsesForJqgrid(questionResult));
+		// show confidence levels if this feature is turned ON
 		if (assessment.isEnableConfidenceLevels()) {
-		    userData.put(questionResult.getConfidenceLevel());
+		    userData.add(questionResult.getConfidenceLevel());
 		}
-		
-		userData.put(questionResult.getMark());
-		if (userDto.getPortraitId() != null ) 
-		    userData.put(userDto.getPortraitId());
-		
+
+		userData.add(questionResult.getMark());
+		if (userDto.getPortraitId() != null) {
+		    userData.add(userDto.getPortraitId());
+		}
+
 	    } else {
-		userData.put("");
-		userData.put("");
-		userData.put(fullName);
-		userData.put("-");
+		userData.add("");
+		userData.add("");
+		userData.add(fullName);
+		userData.add("-");
 		if (assessment.isEnableConfidenceLevels()) {
-		    userData.put(-1);
+		    userData.add(-1);
 		}
-		userData.put("-");
+		userData.add("-");
 	    }
 
-	    JSONObject userRow = new JSONObject();
+	    ObjectNode userRow = JsonNodeFactory.instance.objectNode();
 	    userRow.put("id", i++);
-	    userRow.put("cell", userData);
+	    userRow.set("cell", userData);
 
-	    rows.put(userRow);
+	    rows.add(userRow);
 	}
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("total", totalPages);
 	responseJSON.put("page", page);
 	responseJSON.put("records", countSessionUsers);
-	responseJSON.put("rows", rows);
+	responseJSON.set("rows", rows);
 
 	res.setContentType("application/json;charset=utf-8");
 	res.getWriter().print(new String(responseJSON.toString()));
 	return null;
     }
 
-   /**
+    /**
      * Get the mark summary with data arranged in bands. Can be displayed graphically or in a table.
      */
     private ActionForward getMarkChartData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	    HttpServletResponse res) throws IOException, ServletException {
 
 	initAssessmentService();
 
@@ -554,22 +558,23 @@
 	Long contentId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Assessment assessment = service.getAssessmentByContentId(contentId);
 	List<Number> results = null;
-	
-	if ( assessment != null ) {
-	    if ( assessment.isUseSelectLeaderToolOuput() ) {
+
+	if (assessment != null) {
+	    if (assessment.isUseSelectLeaderToolOuput()) {
 		results = service.getMarksArrayForLeaders(contentId);
 	    } else {
 		Long sessionId = WebUtil.readLongParam(request, AssessmentConstants.ATTR_TOOL_SESSION_ID);
 		results = service.getMarksArray(sessionId);
 	    }
 	}
-	
-	JSONObject responseJSON = new JSONObject();
-	if ( results != null )
-	    responseJSON.put("data", results);
-	else 
-	    responseJSON.put("data", new Float[0]);
 
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	if (results != null) {
+	    responseJSON.set("data", JsonUtil.readArray(results));
+	} else {
+	    responseJSON.set("data", JsonUtil.readArray(new Float[0]));
+	}
+
 	res.setContentType("application/json;charset=utf-8");
 	res.getWriter().write(responseJSON.toString());
 	return null;
@@ -638,7 +643,7 @@
 
 	return null;
     }
-    
+
     private ActionForward statistic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
@@ -650,8 +655,8 @@
 
 	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Assessment assessment = service.getAssessmentByContentId(contentId);
-	if ( assessment != null ) {
-	    if ( assessment.isUseSelectLeaderToolOuput() ) {
+	if (assessment != null) {
+	    if (assessment.isUseSelectLeaderToolOuput()) {
 		LeaderResultsDTO leaderDto = service.getLeaderResultsDTOForLeaders(contentId);
 		sessionMap.put("leaderDto", leaderDto);
 	    } else {
@@ -662,7 +667,6 @@
 	return mapping.findForward(AssessmentConstants.SUCCESS);
     }
 
-
     // *************************************************************************************
     // Private method
     // *************************************************************************************
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -36,8 +36,6 @@
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -75,6 +73,8 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * An implementation of the IChatService interface.
  *
@@ -203,9 +203,9 @@
 
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -661,14 +661,14 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     /* Private methods */
-    private Map<Long, ChatMessageFilter> messageFilters = new ConcurrentHashMap<Long, ChatMessageFilter>();
+    private Map<Long, ChatMessageFilter> messageFilters = new ConcurrentHashMap<>();
 
     public IChatDAO getChatDAO() {
 	return chatDAO;
@@ -819,7 +819,7 @@
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getChatOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
-    
+
     @Override
     public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
 	ChatUser learner = getUserByUserIdAndSessionId(learnerId, toolSessionId);
@@ -830,20 +830,23 @@
 	Date startDate = null;
 	Date endDate = learner.getLastPresence();
 	List<ChatMessage> messages = getMessagesForUser(learner);
-	for ( ChatMessage message : messages ) {
+	for (ChatMessage message : messages) {
 	    Date sendDate = message.getSendDate();
-	    if ( sendDate != null ) {
-		if ( startDate == null || sendDate.before(startDate) )
+	    if (sendDate != null) {
+		if (startDate == null || sendDate.before(startDate)) {
 		    startDate = sendDate;
-		if ( endDate == null || sendDate.after(endDate) )
+		}
+		if (endDate == null || sendDate.after(endDate)) {
 		    endDate = sendDate;
+		}
 	    }
 	}
-	
-	if (learner.isFinishedActivity())
+
+	if (learner.isFinishedActivity()) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate);
-	else
+	} else {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);
+	}
     }
     // =========================================================================================
 
@@ -854,25 +857,24 @@
      * fields reflectInstructions, lockWhenFinished, filterKeywords
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Chat content = new Chat();
 	Date updateDate = new Date();
 	content.setCreateDate(updateDate);
 	content.setUpdateDate(updateDate);
 	content.setToolContentId(toolContentID);
-	content.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	content.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	content.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	content.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 	content.setCreateBy(userID.longValue());
 
 	content.setContentInUse(false);
 	content.setDefineLater(false);
-	content.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
-	content.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	content.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	content.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	content.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	content.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
 
-	String filterKeywords = JsonUtil.opt(toolContentJSON, "filterKeywords", null);
+	String filterKeywords = JsonUtil.optString(toolContentJSON, "filterKeywords");
 	content.setFilteringEnabled((filterKeywords != null) && (filterKeywords.length() > 0));
 	content.setFilterKeywords(filterKeywords);
 	// submissionDeadline is set in monitoring
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -40,8 +40,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
@@ -71,7 +69,6 @@
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranSession;
 import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser;
 import org.lamsfoundation.lams.tool.dokumaran.util.DokumaranToolContentHandler;
-import org.lamsfoundation.lams.tool.dokumaran.web.action.LearningWebsocketServer;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
@@ -82,6 +79,8 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import net.gjerull.etherpad.client.EPLiteClient;
 import net.gjerull.etherpad.client.EPLiteException;
 
@@ -276,14 +275,14 @@
     }
 
     @Override
-    public void launchTimeLimit(Long toolContentId) throws JSONException, IOException {
+    public void launchTimeLimit(Long toolContentId) throws IOException {
 	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
 	dokumaran.setTimeLimitLaunchedDate(new Date());
 	dokumaranDao.saveObject(dokumaran);
     }
 
     @Override
-    public void addOneMinute(Long toolContentId) throws JSONException, IOException {
+    public void addOneMinute(Long toolContentId) throws IOException {
 	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
 
 	int timeLimit = dokumaran.getTimeLimit();
@@ -1036,7 +1035,7 @@
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -1115,41 +1114,42 @@
 
     /**
      * Used by the Rest calls to create content. Mandatory fields in toolContentJSON: title, instructions, dokumaran,
-     * user fields firstName, lastName and loginName Dokumaran must contain a JSONArray of JSONObject objects, which
+     * user fields firstName, lastName and loginName Dokumaran must contain a ArrayNode of ObjectNode objects, which
      * have the following mandatory fields: title, description, type. If there are instructions for a dokumaran, the
-     * instructions are a JSONArray of Strings. There should be at least one dokumaran object in the dokumaran array.
+     * instructions are a ArrayNode of Strings. There should be at least one dokumaran object in the dokumaran array.
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Date updateDate = new Date();
 
 	Dokumaran dokumaran = new Dokumaran();
 	dokumaran.setContentId(toolContentID);
-	dokumaran.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	dokumaran.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	dokumaran.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	dokumaran.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 	dokumaran.setCreated(updateDate);
 
-	dokumaran.setTimeLimit(JsonUtil.opt(toolContentJSON, "timeLimit", 0));
-	dokumaran.setShowChat(JsonUtil.opt(toolContentJSON, "showChat", Boolean.FALSE));
-	dokumaran.setShowLineNumbers(JsonUtil.opt(toolContentJSON, "showLineNumbers", Boolean.FALSE));
-	dokumaran.setSharedPadId(JsonUtil.opt(toolContentJSON, "sharedPadId", (String) null));
-	dokumaran.setLockWhenFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	dokumaran.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	dokumaran.setReflectInstructions(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
-	dokumaran.setUseSelectLeaderToolOuput(JsonUtil.opt(toolContentJSON, "useSelectLeaderToolOuput", Boolean.FALSE));
-	dokumaran.setAllowMultipleLeaders(JsonUtil.opt(toolContentJSON, "allowMultipleLeaders", Boolean.FALSE));
+	dokumaran.setTimeLimit(JsonUtil.optInt(toolContentJSON, "timeLimit", 0));
+	dokumaran.setShowChat(JsonUtil.optBoolean(toolContentJSON, "showChat", Boolean.FALSE));
+	dokumaran.setShowLineNumbers(JsonUtil.optBoolean(toolContentJSON, "showLineNumbers", Boolean.FALSE));
+	dokumaran.setSharedPadId(JsonUtil.optString(toolContentJSON, "sharedPadId"));
+	dokumaran.setLockWhenFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	dokumaran.setReflectOnActivity(
+		JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	dokumaran.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	dokumaran.setUseSelectLeaderToolOuput(
+		JsonUtil.optBoolean(toolContentJSON, "useSelectLeaderToolOuput", Boolean.FALSE));
+	dokumaran.setAllowMultipleLeaders(JsonUtil.optBoolean(toolContentJSON, "allowMultipleLeaders", Boolean.FALSE));
 
 	dokumaran.setContentInUse(false);
 	dokumaran.setDefineLater(false);
 
 	DokumaranUser dokumaranUser = getUserByIDAndContent(userID.longValue(), toolContentID);
 	if (dokumaranUser == null) {
 	    dokumaranUser = new DokumaranUser();
-	    dokumaranUser.setFirstName(toolContentJSON.getString("firstName"));
-	    dokumaranUser.setLastName(toolContentJSON.getString("lastName"));
-	    dokumaranUser.setLoginName(toolContentJSON.getString("loginName"));
+	    dokumaranUser.setFirstName(JsonUtil.optString(toolContentJSON, "firstName"));
+	    dokumaranUser.setLastName(JsonUtil.optString(toolContentJSON, "lastName"));
+	    dokumaranUser.setLoginName(JsonUtil.optString(toolContentJSON, "loginName"));
 	    // dokumaranUser.setDokumaran(content);
 	}
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -42,9 +42,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.ITicket;
@@ -115,6 +112,9 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  *
  * @author Steve.Ni
@@ -1194,7 +1194,7 @@
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -1520,50 +1520,49 @@
 
     /**
      * Used by the Rest calls to create content. Mandatory fields in toolContentJSON: title, instructions, topics.
-     * Topics must contain a JSONArray of JSONObject objects, which have the following mandatory fields: subject, body
+     * Topics must contain a ArrayNode of ObjectNode objects, which have the following mandatory fields: subject, body
      * There will usually be at least one topic object in the Topics array but the array may be of zero length.
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Forum forum = new Forum();
 	Date updateDate = new Date();
 	forum.setCreated(updateDate);
 	forum.setUpdated(updateDate);
 
 	forum.setContentId(toolContentID);
-	forum.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	forum.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	forum.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	forum.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 
-	forum.setAllowAnonym(JsonUtil.opt(toolContentJSON, "allowAnonym", Boolean.FALSE));
-	forum.setAllowEdit(JsonUtil.opt(toolContentJSON, "allowEdit", Boolean.TRUE)); // defaults to true in the default
-										      // entry in the db
-	forum.setAllowNewTopic(JsonUtil.opt(toolContentJSON, "allowNewTopic", Boolean.TRUE)); // defaults to true in the
-											      // default entry in the db
-	forum.setAllowRateMessages(JsonUtil.opt(toolContentJSON, "allowRateMessages", Boolean.FALSE));
-	forum.setAllowRichEditor(JsonUtil.opt(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
-	forum.setAllowUpload(JsonUtil.opt(toolContentJSON, "allowUpload", Boolean.FALSE));
+	forum.setAllowAnonym(JsonUtil.optBoolean(toolContentJSON, "allowAnonym", Boolean.FALSE));
+	forum.setAllowEdit(JsonUtil.optBoolean(toolContentJSON, "allowEdit", Boolean.TRUE)); // defaults to true in the default
+	// entry in the db
+	forum.setAllowNewTopic(JsonUtil.optBoolean(toolContentJSON, "allowNewTopic", Boolean.TRUE)); // defaults to true in the
+	// default entry in the db
+	forum.setAllowRateMessages(JsonUtil.optBoolean(toolContentJSON, "allowRateMessages", Boolean.FALSE));
+	forum.setAllowRichEditor(JsonUtil.optBoolean(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
+	forum.setAllowUpload(JsonUtil.optBoolean(toolContentJSON, "allowUpload", Boolean.FALSE));
 	forum.setContentInUse(false);
 	forum.setDefineLater(false);
-	forum.setLimitedMaxCharacters(JsonUtil.opt(toolContentJSON, "limitedMaxCharacters", Boolean.TRUE));
-	forum.setLimitedMinCharacters(JsonUtil.opt(toolContentJSON, "limitedMinCharacters", Boolean.FALSE));
-	forum.setLockWhenFinished(JsonUtil.opt(toolContentJSON, "lockWhenFinished", Boolean.FALSE));
-	forum.setMaxCharacters(JsonUtil.opt(toolContentJSON, "maxCharacters", 5000)); // defaults to 5000 chars in the
-										      // default entry in the db.
-	forum.setMaximumRate(JsonUtil.opt(toolContentJSON, "maximumRate", 0));
-	forum.setMaximumReply(JsonUtil.opt(toolContentJSON, "maximumReply", 0));
-	forum.setMinCharacters(JsonUtil.opt(toolContentJSON, "minCharacters", 0));
-	forum.setMinimumRate(JsonUtil.opt(toolContentJSON, "minimumRate", 0));
-	forum.setMinimumReply(JsonUtil.opt(toolContentJSON, "minimumReply", 0));
+	forum.setLimitedMaxCharacters(JsonUtil.optBoolean(toolContentJSON, "limitedMaxCharacters", Boolean.TRUE));
+	forum.setLimitedMinCharacters(JsonUtil.optBoolean(toolContentJSON, "limitedMinCharacters", Boolean.FALSE));
+	forum.setLockWhenFinished(JsonUtil.optBoolean(toolContentJSON, "lockWhenFinished", Boolean.FALSE));
+	forum.setMaxCharacters(JsonUtil.optInt(toolContentJSON, "maxCharacters", 5000)); // defaults to 5000 chars in the
+											 // default entry in the db.
+	forum.setMaximumRate(JsonUtil.optInt(toolContentJSON, "maximumRate", 0));
+	forum.setMaximumReply(JsonUtil.optInt(toolContentJSON, "maximumReply", 0));
+	forum.setMinCharacters(JsonUtil.optInt(toolContentJSON, "minCharacters", 0));
+	forum.setMinimumRate(JsonUtil.optInt(toolContentJSON, "minimumRate", 0));
+	forum.setMinimumReply(JsonUtil.optInt(toolContentJSON, "minimumReply", 0));
 	forum.setNotifyLearnersOnForumPosting(
-		JsonUtil.opt(toolContentJSON, "notifyLearnersOnForumPosting", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "notifyLearnersOnForumPosting", Boolean.FALSE));
 	forum.setNotifyLearnersOnMarkRelease(
-		JsonUtil.opt(toolContentJSON, "notifyLearnersOnMarkRelease", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "notifyLearnersOnMarkRelease", Boolean.FALSE));
 	forum.setNotifyTeachersOnForumPosting(
-		JsonUtil.opt(toolContentJSON, "notifyTeachersOnForumPosting", Boolean.FALSE));
-	forum.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
-	forum.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnForumPosting", Boolean.FALSE));
+	forum.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	forum.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
 	// submissionDeadline is set in monitoring
 
 	// *******************************Handle user*******************
@@ -1577,27 +1576,27 @@
 	//		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	ForumUser forumUser = getUserByID(userID.longValue());
 	if (forumUser == null) {
-	    forumUser = new ForumUser(userID.longValue(), toolContentJSON.getString("firstName"),
-		    toolContentJSON.getString("lastName"), toolContentJSON.getString("loginName"));
+	    forumUser = new ForumUser(userID.longValue(), JsonUtil.optString(toolContentJSON, "firstName"),
+		    JsonUtil.optString(toolContentJSON, "lastName"), JsonUtil.optString(toolContentJSON, "loginName"));
 	    getForumUserDao().save(forumUser);
 	}
 	forum.setCreatedBy(forumUser);
 
 	updateForum(forum);
 
 	// **************************** Handle topic *********************
-	JSONArray topics = toolContentJSON.getJSONArray("topics");
-	for (int i = 0; i < topics.length(); i++) {
-	    JSONObject msgData = (JSONObject) topics.get(i);
+	ArrayNode topics = JsonUtil.optArray(toolContentJSON, "topics");
+	for (int i = 0; i < topics.size(); i++) {
+	    ObjectNode msgData = (ObjectNode) topics.get(i);
 	    Message newMsg = new Message();
 	    //	    newMsg.setAttachments(attachments); TODO
 	    newMsg.setCreatedBy(forumUser);
 	    newMsg.setCreated(updateDate);
 	    newMsg.setModifiedBy(null);
 	    newMsg.setUpdated(updateDate);
 
-	    newMsg.setSubject(msgData.getString("subject"));
-	    newMsg.setBody(msgData.getString("body"));
+	    newMsg.setSubject(JsonUtil.optString(msgData, "subject"));
+	    newMsg.setBody(JsonUtil.optString(msgData, "body"));
 	    newMsg.setForum(forum);
 	    newMsg.setHideFlag(false);
 	    // newMsg.setIsAnonymous(false); Does not appear on authoring interface
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r5e36aad06f5b9c4fe8551ddc8af5a734ba8058bf -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 5e36aad06f5b9c4fe8551ddc8af5a734ba8058bf)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -51,9 +51,6 @@
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
@@ -113,6 +110,10 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.dao.DataAccessException;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  *
  * The POJO implementation of Mc service. All business logics of MCQ tool are implemented in this class. It translate
@@ -202,7 +203,7 @@
 			leaderAttempt.isAttemptCorrect(), leaderAttempt.getConfidenceLevel());
 		mcUsrAttemptDAO.saveMcUsrAttempt(userAttempt);
 
-	    // if it's been changed by the leader
+		// if it's been changed by the leader
 	    } else if (leaderAttempt.getAttemptTime().compareTo(userAttempt.getAttemptTime()) != 0) {
 		userAttempt.setMcOptionsContent(leaderAttempt.getMcOptionsContent());
 		userAttempt.setConfidenceLevel(leaderAttempt.getConfidenceLevel());
@@ -251,7 +252,7 @@
 	//update questions' hash
 	String newHash = mcQueContent.getQuestion() == null ? null : HashUtil.sha1(mcQueContent.getQuestion());
 	mcQueContent.setQuestionHash(newHash);
-	
+
 	mcQueContentDAO.saveOrUpdateMcQueContent(mcQueContent);
     }
 
@@ -388,12 +389,13 @@
 
     @Override
     public Long getPortraitId(Long userId) {
-	if ( userId != null ) {
+	if (userId != null) {
 	    User user = (User) userManagementService.findById(User.class, userId.intValue());
 	    return user != null ? user.getPortraitUuid() : null;
 	}
 	return null;
     }
+
     @Override
     public List<McUserMarkDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy,
 	    String sortOrder, String searchString) {
@@ -576,7 +578,8 @@
 		    for (McUsrAttempt attempt : finalizedUserAttempts) {
 			Integer displayOrder = attempt.getMcQueContent().getDisplayOrder();
 			int arrayIndex = (displayOrder != null) && (displayOrder.intValue() > 0)
-				? displayOrder.intValue() - 1 : 1;
+				? displayOrder.intValue() - 1
+				: 1;
 			if (userMarks[arrayIndex] == null) {
 
 			    // We get the mark for the attempt if the answer is correct and we don't allow
@@ -635,7 +638,7 @@
     public McUsrAttempt getUserAttemptByQuestion(Long queUsrUid, Long mcQueContentId) throws McApplicationException {
 	return mcUsrAttemptDAO.getUserAttemptByQuestion(queUsrUid, mcQueContentId);
     }
-    
+
     @Override
     public List<ToolOutputDTO> getLearnerMarksByContentId(Long toolContentId) {
 	return mcUsrAttemptDAO.getLearnerMarksByContentId(toolContentId);
@@ -756,9 +759,9 @@
 	    } else {
 		String error = new StringBuilder(
 			"Attempting to update the mark for a non-leader. Cannot update. Session ")
-			.append(mcSession.getSession_name()).append(":").append(mcSession.getMcSessionId())
-			.append(" user ").append(selectedUser.getUsername()).append(":")
-			.append(selectedUser.getQueUsrId()).toString();
+				.append(mcSession.getSession_name()).append(":").append(mcSession.getMcSessionId())
+				.append(" user ").append(selectedUser.getUsername()).append(":")
+				.append(selectedUser.getQueUsrId()).toString();
 		logger.warn(error);
 	    }
 	} else {
@@ -767,7 +770,7 @@
 	}
 
 	for (McUsrAttempt attempt : userAttempts) {
-	    
+
 	    attempt.setMark(newMark);
 	    mcUsrAttemptDAO.saveMcUsrAttempt(attempt);
 
@@ -777,12 +780,12 @@
 	    updateMcQueUsr(user);
 
 	    // propagate changes to Gradebook
-	    gradebookService.updateActivityMark(new Double(totalMark), null, user.getQueUsrId().intValue(), 
+	    gradebookService.updateActivityMark(new Double(totalMark), null, user.getQueUsrId().intValue(),
 		    mcSession.getMcSessionId(), false);
 
 	    // record mark change with audit service
-	    auditService.logMarkChange(McAppConstants.TOOL_SIGNATURE, user.getQueUsrId(),
-		    user.getUsername(), "" + oldMark, "" + totalMark);
+	    auditService.logMarkChange(McAppConstants.TOOL_SIGNATURE, user.getQueUsrId(), user.getUsername(),
+		    "" + oldMark, "" + totalMark);
 
 	}
     }
@@ -910,7 +913,7 @@
 		if (newTotalMark != oldTotalMark) {
 		    user.setLastAttemptTotalMark(newTotalMark);
 		    updateMcQueUsr(user);
-		    
+
 		    gradebookService.updateActivityMark(new Double(newTotalMark), null, user.getQueUsrId().intValue(),
 			    toolSessionId, false);
 		}
@@ -1518,7 +1521,7 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return mcOutputFactory.getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return mcOutputFactory.getToolOutputs(name, this, toolContentId);
@@ -1530,9 +1533,9 @@
 	if (toolSessionId == null) {
 	    return confidenceLevelDtos;
 	}
-	
+
 	McContent content = getMcSessionById(toolSessionId).getMcContent();
-	
+
 	//in case McContent is leader aware return all leaders confidences, otherwise - confidences from the users from the same group as requestor  
 	List<Object[]> userAttemptsAndPortraits = content.isUseSelectLeaderToolOuput()
 		? mcUsrAttemptDAO.getLeadersFinalizedAttemptsByContentId(content.getMcContentId())
@@ -1614,10 +1617,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -1726,8 +1729,8 @@
 			    new Integer(user.getQueUsrId().toString()));
 
 		    if (notebookEntry != null) {
-			ReflectionDTO reflectionDTO = new ReflectionDTO(user, 
-				mcSession.getMcSessionId().toString(), notebookEntry);
+			ReflectionDTO reflectionDTO = new ReflectionDTO(user, mcSession.getMcSessionId().toString(),
+				notebookEntry);
 			reflectionsContainerDTO.add(reflectionDTO);
 		    }
 		}
@@ -1821,32 +1824,41 @@
 	for (McUsrAttempt item : attempts) {
 	    Date newDate = item.getAttemptTime();
 	    if (newDate != null) {
-		if (startDate == null || newDate.before(startDate))
+		if (startDate == null || newDate.before(startDate)) {
 		    startDate = newDate;
-		if (endDate == null || newDate.after(endDate))
+		}
+		if (endDate == null || newDate.after(endDate)) {
 		    endDate = newDate;
+		}
 	    }
 	}
 
-	if (learner.isResponseFinalised())
+	if (learner.isResponseFinalised()) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate);
-	else
+	} else {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);
+	}
     }
 
     @Override
     public LeaderResultsDTO getLeaderResultsDTOForLeaders(Long contentId) {
 	LeaderResultsDTO newDto = new LeaderResultsDTO(contentId);
 	Object[] markStats = mcUserDAO.getStatsMarksForLeaders(contentId);
-	if ( markStats != null ) {
-	    newDto.setMinMark(markStats[0] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[0], (Locale)null, 2) : "0.00");
-	    newDto.setAvgMark(markStats[1] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[1], (Locale)null, 2) : "0.00");
-	    newDto.setMaxMark(markStats[2] != null ? NumberUtil.formatLocalisedNumber((Float)markStats[2], (Locale)null, 2) : "0.00");
-	    newDto.setNumberGroupsLeaderFinished((Integer)markStats[3]);
+	if (markStats != null) {
+	    newDto.setMinMark(
+		    markStats[0] != null ? NumberUtil.formatLocalisedNumber((Float) markStats[0], (Locale) null, 2)
+			    : "0.00");
+	    newDto.setAvgMark(
+		    markStats[1] != null ? NumberUtil.formatLocalisedNumber((Float) markStats[1], (Locale) null, 2)
+			    : "0.00");
+	    newDto.setMaxMark(
+		    markStats[2] != null ? NumberUtil.formatLocalisedNumber((Float) markStats[2], (Locale) null, 2)
+			    : "0.00");
+	    newDto.setNumberGroupsLeaderFinished((Integer) markStats[3]);
 	}
 	return newDto;
     }
-    
+
     @SuppressWarnings("unchecked")
     @Override
     public List<SessionDTO> getSessionDtos(Long contentId, boolean includeStatistics) {
@@ -1867,11 +1879,14 @@
 		    Object[] markStats = mcUserDAO.getStatsMarksBySession(session.getMcSessionId());
 		    if (markStats != null) {
 			sessionDto.setMinMark(markStats[0] != null
-				? NumberUtil.formatLocalisedNumber((Float) markStats[0], (Locale) null, 2) : "0.00");
+				? NumberUtil.formatLocalisedNumber((Float) markStats[0], (Locale) null, 2)
+				: "0.00");
 			sessionDto.setAvgMark(markStats[1] != null
-				? NumberUtil.formatLocalisedNumber((Float) markStats[1], (Locale) null, 2) : "0.00");
+				? NumberUtil.formatLocalisedNumber((Float) markStats[1], (Locale) null, 2)
+				: "0.00");
 			sessionDto.setMaxMark(markStats[2] != null
-				? NumberUtil.formatLocalisedNumber((Float) markStats[2], (Locale) null, 2) : "0.00");
+				? NumberUtil.formatLocalisedNumber((Float) markStats[2], (Locale) null, 2)
+				: "0.00");
 		    }
 		}
 
@@ -1880,7 +1895,7 @@
 	}
 	return sessionDtos;
     }
-	
+
     @Override
     public List<Number> getMarksArray(Long sessionId) {
 	return mcUserDAO.getRawUserMarksBySession(sessionId);
@@ -1895,16 +1910,15 @@
 
     /**
      * Rest call to create a new Multiple Choice content. Required fields in toolContentJSON: "title", "instructions",
-     * "questions". The questions entry should be JSONArray containing JSON objects, which in turn must contain
-     * "questionText", "displayOrder" (Integer) and a JSONArray "answers". The answers entry should be JSONArray
+     * "questions". The questions entry should be ArrayNode containing JSON objects, which in turn must contain
+     * "questionText", "displayOrder" (Integer) and a ArrayNode "answers". The answers entry should be ArrayNode
      * containing JSON objects, which in turn must contain "answerText", "displayOrder" (Integer), "correct" (Boolean).
      *
      * Retries are controlled by lockWhenFinished, which defaults to true (no retries).
      */
     @SuppressWarnings("unchecked")
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	McContent mcq = new McContent();
 	Date updateDate = new Date();
@@ -1915,39 +1929,39 @@
 	mcq.setDefineLater(false);
 
 	mcq.setMcContentId(toolContentID);
-	mcq.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	mcq.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	mcq.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	mcq.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 
-	mcq.setRetries(JsonUtil.opt(toolContentJSON, "allowRetries", Boolean.FALSE));
+	mcq.setRetries(JsonUtil.optBoolean(toolContentJSON, "allowRetries", Boolean.FALSE));
 	mcq.setUseSelectLeaderToolOuput(
-		JsonUtil.opt(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
-	mcq.setReflect(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	mcq.setReflectionSubject(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, ""));
-	mcq.setQuestionsSequenced(JsonUtil.opt(toolContentJSON, "questionsSequenced", Boolean.FALSE));
-	mcq.setRandomize(JsonUtil.opt(toolContentJSON, "randomize", Boolean.FALSE));
-	mcq.setShowReport(JsonUtil.opt(toolContentJSON, "showReport", Boolean.FALSE));
-	mcq.setDisplayAnswers(JsonUtil.opt(toolContentJSON, "displayAnswers", Boolean.FALSE));
-	mcq.setShowMarks(JsonUtil.opt(toolContentJSON, "showMarks", Boolean.FALSE));
-	mcq.setPrefixAnswersWithLetters(JsonUtil.opt(toolContentJSON, "prefixAnswersWithLetters", Boolean.TRUE));
-	mcq.setPassMark(JsonUtil.opt(toolContentJSON, "passMark", 0));
-	mcq.setEnableConfidenceLevels(JsonUtil.opt(toolContentJSON, "enableConfidenceLevels", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
+	mcq.setReflect(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	mcq.setReflectionSubject(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, ""));
+	mcq.setQuestionsSequenced(JsonUtil.optBoolean(toolContentJSON, "questionsSequenced", Boolean.FALSE));
+	mcq.setRandomize(JsonUtil.optBoolean(toolContentJSON, "randomize", Boolean.FALSE));
+	mcq.setShowReport(JsonUtil.optBoolean(toolContentJSON, "showReport", Boolean.FALSE));
+	mcq.setDisplayAnswers(JsonUtil.optBoolean(toolContentJSON, "displayAnswers", Boolean.FALSE));
+	mcq.setShowMarks(JsonUtil.optBoolean(toolContentJSON, "showMarks", Boolean.FALSE));
+	mcq.setPrefixAnswersWithLetters(JsonUtil.optBoolean(toolContentJSON, "prefixAnswersWithLetters", Boolean.TRUE));
+	mcq.setPassMark(JsonUtil.optInt(toolContentJSON, "passMark", 0));
+	mcq.setEnableConfidenceLevels(JsonUtil.optBoolean(toolContentJSON, "enableConfidenceLevels", Boolean.FALSE));
 	// submissionDeadline is set in monitoring
 
 	createMc(mcq);
 
 	// Questions
-	JSONArray questions = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
-	for (int i = 0; i < questions.length(); i++) {
-	    JSONObject questionData = (JSONObject) questions.get(i);
-	    String questionText = questionData.getString(RestTags.QUESTION_TEXT);
-	    McQueContent question = new McQueContent(questionText, null, questionData.getInt(RestTags.DISPLAY_ORDER), 1,
-		    "", mcq, null, new HashSet<McOptsContent>());
+	ArrayNode questions = JsonUtil.optArray(toolContentJSON, RestTags.QUESTIONS);
+	for (JsonNode questionData : questions) {
+	    McQueContent question = new McQueContent(JsonUtil.optString(questionData, RestTags.QUESTION_TEXT), null,
+		    JsonUtil.optInt(questionData, RestTags.DISPLAY_ORDER), 1, "", mcq, null,
+		    new HashSet<McOptsContent>());
 
-	    JSONArray optionsData = questionData.getJSONArray(RestTags.ANSWERS);
-	    for (int j = 0; j < optionsData.length(); j++) {
-		JSONObject optionData = (JSONObject) optionsData.get(j);
-		question.getMcOptionsContents().add(new McOptsContent(optionData.getInt(RestTags.DISPLAY_ORDER),
-			optionData.getBoolean(RestTags.CORRECT), optionData.getString(RestTags.ANSWER_TEXT), question));
+	    ArrayNode optionsData = JsonUtil.optArray(questionData, RestTags.ANSWERS);
+	    for (JsonNode optionData : optionsData) {
+		question.getMcOptionsContents()
+			.add(new McOptsContent(JsonUtil.optInt(optionData, RestTags.DISPLAY_ORDER),
+				JsonUtil.optBoolean(optionData, RestTags.CORRECT),
+				JsonUtil.optString(optionData, RestTags.ANSWER_TEXT), question));
 	    }
 	    saveOrUpdateMcQueContent(question);
 	}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java	(.../McLearningAction.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java	(.../McLearningAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -39,8 +39,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
@@ -67,6 +65,9 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Ozgur Demirtas
  */
@@ -259,13 +260,14 @@
 	String httpSessionID = mcLearningForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
 	request.getSession().setAttribute(httpSessionID, sessionMap);
-	
+
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	McSession session = mcService.getMcSessionById(new Long(toolSessionID));
 	String toolContentId = session.getMcContent().getMcContentId().toString();
 	McContent mcContent = mcService.getMcContent(new Long(toolContentId));
 
-	List<String> answers = McLearningAction.parseLearnerAnswers(mcLearningForm, request, mcContent.isQuestionsSequenced());
+	List<String> answers = McLearningAction.parseLearnerAnswers(mcLearningForm, request,
+		mcContent.isQuestionsSequenced());
 	if (mcContent.isQuestionsSequenced()) {
 	    sessionMap.put(McAppConstants.QUESTION_AND_CANDIDATE_ANSWERS_KEY, answers);
 	}
@@ -282,7 +284,7 @@
 	/* process the answers */
 	List<AnswerDTO> answerDtos = buildAnswerDtos(answers, mcContent, request);
 	mcService.saveUserAttempt(user, answerDtos);
-	
+
 	//calculate total learner mark
 	int learnerMark = 0;
 	for (AnswerDTO answerDto : answerDtos) {
@@ -329,13 +331,14 @@
 	}
 
 	//parse learner input
-	List<String> answers = McLearningAction.parseLearnerAnswers(mcLearningForm, request, mcContent.isQuestionsSequenced());
+	List<String> answers = McLearningAction.parseLearnerAnswers(mcLearningForm, request,
+		mcContent.isQuestionsSequenced());
 	sessionMap.put(McAppConstants.QUESTION_AND_CANDIDATE_ANSWERS_KEY, answers);
 
 	//save user attempt
 	List<AnswerDTO> answerDtos = buildAnswerDtos(answers, mcContent, request);
 	mcService.saveUserAttempt(user, answerDtos);
-	
+
 	List<AnswerDTO> learnerAnswersDTOList = mcService.getAnswersFromDatabase(mcContent, user);
 	request.setAttribute(McAppConstants.LEARNER_ANSWERS_DTO_LIST, learnerAnswersDTOList);
 
@@ -388,7 +391,7 @@
 
 	String toolContentId = mcSession.getMcContent().getMcContentId().toString();
 	McContent mcContent = mcService.getMcContent(new Long(toolContentId));
-	
+
 	String sessionMapID = mcLearningForm.getHttpSessionID();
 	request.setAttribute("sessionMapID", sessionMapID);
 
@@ -491,15 +494,17 @@
 	mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(mcContent.isShowMarks()).toString());
 	mcGeneralLearnerFlowDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString());
 	mcGeneralLearnerFlowDTO.setLearnerMark(user.getLastAttemptTotalMark());
-	
+
 	Object[] markStatistics = null;
 	if (mcContent.isShowMarks()) {
 	    markStatistics = mcService.getMarkStatistics(mcSession);
 	}
 	if (markStatistics != null) {
-	    mcGeneralLearnerFlowDTO.setLowestMark(markStatistics[0] != null ? ((Float)markStatistics[0]).intValue() : 0);
-	    mcGeneralLearnerFlowDTO.setAverageMark(markStatistics[1] != null ? ((Float)markStatistics[1]).intValue() : 0);
-	    mcGeneralLearnerFlowDTO.setTopMark(markStatistics[2] != null ? ((Float)markStatistics[2]).intValue() : 0);
+	    mcGeneralLearnerFlowDTO
+		    .setLowestMark(markStatistics[0] != null ? ((Float) markStatistics[0]).intValue() : 0);
+	    mcGeneralLearnerFlowDTO
+		    .setAverageMark(markStatistics[1] != null ? ((Float) markStatistics[1]).intValue() : 0);
+	    mcGeneralLearnerFlowDTO.setTopMark(markStatistics[2] != null ? ((Float) markStatistics[2]).intValue() : 0);
 	} else {
 	    mcGeneralLearnerFlowDTO.setLowestMark(0);
 	    mcGeneralLearnerFlowDTO.setAverageMark(0);
@@ -572,7 +577,7 @@
      * checks Leader Progress
      */
     public ActionForward checkLeaderProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 
 	if (mcService == null) {
 	    mcService = McServiceProxy.getMcService(getServlet().getServletContext());
@@ -584,10 +589,10 @@
 
 	boolean isLeaderResponseFinalized = leader.isResponseFinalised();
 
-	JSONObject JSONObject = new JSONObject();
-	JSONObject.put("isLeaderResponseFinalized", isLeaderResponseFinalized);
+	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
+	ObjectNode.put("isLeaderResponseFinalized", isLeaderResponseFinalized);
 	response.setContentType("application/x-json;charset=utf-8");
-	response.getWriter().print(JSONObject);
+	response.getWriter().print(ObjectNode);
 	return null;
     }
 
@@ -705,15 +710,17 @@
 	    return null;
 	}
 
-	List<String> answers = McLearningAction.parseLearnerAnswers(mcLearningForm, request, mcContent.isQuestionsSequenced());
+	List<String> answers = McLearningAction.parseLearnerAnswers(mcLearningForm, request,
+		mcContent.isQuestionsSequenced());
 
 	List<AnswerDTO> answerDtos = buildAnswerDtos(answers, mcContent, request);
 	mcService.saveUserAttempt(user, answerDtos);
 
 	return null;
     }
 
-    private static List<String> parseLearnerAnswers(McLearningForm mcLearningForm, HttpServletRequest request, boolean isQuestionsSequenced) {
+    private static List<String> parseLearnerAnswers(McLearningForm mcLearningForm, HttpServletRequest request,
+	    boolean isQuestionsSequenced) {
 	String httpSessionID = mcLearningForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
===================================================================
diff -u -rb6b28d32fe5b2923cbb30a6c9b889c02e1ba29cf -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision b6b28d32fe5b2923cbb30a6c9b889c02e1ba29cf)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -37,14 +37,10 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionRedirect;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.exception.ToolException;
@@ -62,18 +58,21 @@
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
 import org.lamsfoundation.lams.util.DateUtil;
+import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * * @author Ozgur Demirtas
  */
 public class McMonitoringAction extends LamsDispatchAction {
-    private static Logger logger = Logger.getLogger(McMonitoringAction.class.getName());
-
     /**
      * displayAnswers
      */
@@ -82,11 +81,11 @@
 	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	
+
 	McContent mcContent = mcService.getMcContent(new Long(strToolContentID));
 	mcContent.setDisplayAnswers(new Boolean(true));
 	mcService.updateMc(mcContent);
-	
+
 	// use redirect to prevent resubmition of the same request
 	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("monitoringStarterRedirect"));
 	redirect.addParameter(McAppConstants.TOOL_CONTENT_ID, strToolContentID);
@@ -173,7 +172,8 @@
 
     /**
      * Set Submission Deadline
-     * @throws IOException 
+     *
+     * @throws IOException
      */
     public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
@@ -214,14 +214,14 @@
      * @throws IOException
      */
     public ActionForward setActivityEvaluation(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	IMcService service = McServiceProxy.getMcService(getServlet().getServletContext());
 
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	String activityEvaluation = WebUtil.readStrParam(request, McAppConstants.ATTR_ACTIVITY_EVALUATION);
 	service.setActivityEvaluation(contentID, activityEvaluation);
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("success", "true");
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().print(new String(responseJSON.toString()));
@@ -271,7 +271,7 @@
      * Return paged users for jqGrid.
      */
     public ActionForward getPagedUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -315,38 +315,38 @@
 	int totalPages = new Double(
 		Math.ceil(new Integer(countVisitLogs).doubleValue() / new Integer(rowLimit).doubleValue())).intValue();
 
-	JSONArray rows = new JSONArray();
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
 	int i = 1;
 	for (McUserMarkDTO userDto : userDtos) {
 
-	    JSONArray visitLogData = new JSONArray();
+	    ArrayNode visitLogData = JsonNodeFactory.instance.arrayNode();
 	    Long userUid = Long.parseLong(userDto.getQueUsrId());
-	    visitLogData.put(userUid);
-	    visitLogData.put(userDto.getUserId());
+	    visitLogData.add(userUid);
+	    visitLogData.add(userDto.getUserId());
 
 	    String fullName = StringEscapeUtils.escapeHtml(userDto.getFullName());
 	    if (groupLeader != null && groupLeader.getUid().equals(userUid)) {
 		fullName += " (" + mcService.getLocalizedMessage("label.monitoring.group.leader") + ")";
 	    }
 
-	    visitLogData.put(fullName);
+	    visitLogData.add(fullName);
 	    Long totalMark = (userDto.getTotalMark() == null) ? 0 : userDto.getTotalMark();
-	    visitLogData.put(totalMark);
+	    visitLogData.add(totalMark);
+	    
+	    visitLogData.add(userDto.getPortraitId());
 
-	    visitLogData.put(userDto.getPortraitId());
-
-	    JSONObject userRow = new JSONObject();
+	    ObjectNode userRow = JsonNodeFactory.instance.objectNode();
 	    userRow.put("id", i++);
-	    userRow.put("cell", visitLogData);
+	    userRow.set("cell", visitLogData);
 
-	    rows.put(userRow);
+	    rows.add(userRow);
 	}
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("total", totalPages);
 	responseJSON.put("page", page);
 	responseJSON.put("records", countVisitLogs);
-	responseJSON.put("rows", rows);
+	responseJSON.set("rows", rows);
 
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().write(responseJSON.toString());
@@ -367,48 +367,49 @@
 
 	return null;
     }
-    
+
     /**
      * Get the mark summary with data arranged in bands. Can be displayed graphically or in a table.
      */
     public ActionForward getMarkChartData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	    HttpServletResponse res) throws IOException, ServletException {
 
 	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	McContent mcContent = mcService.getMcContent(contentID);
 	List<Number> results = null;
-	
-	if ( mcContent != null ) {
-	    if ( mcContent.isUseSelectLeaderToolOuput() ) {
+
+	if (mcContent != null) {
+	    if (mcContent.isUseSelectLeaderToolOuput()) {
 		results = mcService.getMarksArrayForLeaders(contentID);
 	    } else {
 		Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 		results = mcService.getMarksArray(sessionID);
 	    }
 	}
-	
-	JSONObject responseJSON = new JSONObject();
-	if ( results != null )
-	    responseJSON.put("data", results);
-	else 
-	    responseJSON.put("data", new Float[0]);
 
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	if (results != null) {
+	    responseJSON.set("data", JsonUtil.readArray(results));
+	} else {
+	    responseJSON.set("data", JsonUtil.readArray(new Float[0]));
+	}
+
 	res.setContentType("application/json;charset=utf-8");
 	res.getWriter().write(responseJSON.toString());
 	return null;
 
     }
-    
+
     public ActionForward statistic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, contentID);
 	McContent mcContent = mcService.getMcContent(contentID);
-	if ( mcContent != null ) {
-	    if ( mcContent.isUseSelectLeaderToolOuput() ) {
+	if (mcContent != null) {
+	    if (mcContent.isUseSelectLeaderToolOuput()) {
 		LeaderResultsDTO leaderDto = mcService.getLeaderResultsDTOForLeaders(contentID);
 		request.setAttribute("leaderDto", leaderDto);
 	    } else {
@@ -417,7 +418,7 @@
 	    }
 	    request.setAttribute("useSelectLeaderToolOutput", mcContent.isUseSelectLeaderToolOuput());
 	}
-	
+
 	// prepare toolOutputDefinitions and activityEvaluation
 	List<String> toolOutputDefinitions = new ArrayList<String>();
 	toolOutputDefinitions.add(McAppConstants.OUTPUT_NAME_LEARNER_MARK);
@@ -429,5 +430,4 @@
 	return mapping.findForward(McAppConstants.STATISTICS);
     }
 
-
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.qa.service;
 
 import java.util.ArrayList;
@@ -39,9 +38,6 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.events.IEventNotificationService;
@@ -96,6 +92,10 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.dao.DataAccessException;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * The POJO implementation of Qa service. All business logics of Qa tool are implemented in this class. It translate the
  * request from presentation layer and perform approporiate database operation.
@@ -569,8 +569,7 @@
     @SuppressWarnings("unchecked")
     public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
 	if (logger.isDebugEnabled()) {
-	    logger
-		    .debug("Removing Q&A answers for user ID " + userId + " and toolContentId " + toolContentId);
+	    logger.debug("Removing Q&A answers for user ID " + userId + " and toolContentId " + toolContentId);
 	}
 
 	QaContent content = qaDAO.getQaByContentId(toolContentId);
@@ -845,7 +844,7 @@
     public boolean isCommentsEnabled(Long toolContentId) {
 	return ratingService.isCommentsEnabled(toolContentId);
     }
-    
+
     @Override
     public boolean isRatingsEnabled(QaContent qaContent) {
 	//check if allow rate answers is ON and also that there is at least one non-comments rating criteria available
@@ -865,7 +864,8 @@
     @Override
     public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
-	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, userId);
+	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired,
+		userId);
     }
 
     @Override
@@ -900,12 +900,12 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return getQaOutputFactory().getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<ToolOutput>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -980,10 +980,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -1211,35 +1211,37 @@
 	if (learner == null) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null);
 	}
-	
+
 	Date startDate = null;
 	Date endDate = null;
 	Set<QaUsrResp> attempts = learner.getQaUsrResps();
 	for (QaUsrResp item : attempts) {
 	    Date newDate = item.getAttemptTime();
 	    if (newDate != null) {
-		if (startDate == null || newDate.before(startDate))
+		if (startDate == null || newDate.before(startDate)) {
 		    startDate = newDate;
-		if (endDate == null || newDate.after(endDate))
+		}
+		if (endDate == null || newDate.after(endDate)) {
 		    endDate = newDate;
+		}
 	    }
 	}
 
-	if (learner.isLearnerFinished())
+	if (learner.isLearnerFinished()) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate);
-	else
+	} else {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);
+	}
     }
     // ****************** REST methods *************************
 
     /**
      * Rest call to create a new Q&A content. Required fields in toolContentJSON: title, instructions, questions. The
-     * questions entry should be JSONArray containing JSON objects, which in turn must contain "questionText",
+     * questions entry should be ArrayNode containing JSON objects, which in turn must contain "questionText",
      * "displayOrder" and may also contain feedback and required (boolean)
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	QaContent qa = new QaContent();
 	Date updateDate = new Date();
@@ -1249,26 +1251,26 @@
 	qa.setCreatedBy(userID.longValue());
 
 	qa.setQaContentId(toolContentID);
-	qa.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	qa.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	qa.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	qa.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 
 	qa.setDefineLater(false);
 
-	qa.setLockWhenFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	qa.setNoReeditAllowed(JsonUtil.opt(toolContentJSON, "noReeditAllowed", Boolean.FALSE));
-	qa.setAllowRichEditor(JsonUtil.opt(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
+	qa.setLockWhenFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	qa.setNoReeditAllowed(JsonUtil.optBoolean(toolContentJSON, "noReeditAllowed", Boolean.FALSE));
+	qa.setAllowRichEditor(JsonUtil.optBoolean(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
 	qa.setUseSelectLeaderToolOuput(
-		JsonUtil.opt(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
-	qa.setMinimumRates(JsonUtil.opt(toolContentJSON, RestTags.MINIMUM_RATES, 0));
-	qa.setMaximumRates(JsonUtil.opt(toolContentJSON, RestTags.MAXIMUM_RATES, 0));
-	qa.setShowOtherAnswers(JsonUtil.opt(toolContentJSON, "showOtherAnswers", Boolean.TRUE));
-	qa.setUsernameVisible(JsonUtil.opt(toolContentJSON, "usernameVisible", Boolean.FALSE));
-	qa.setAllowRateAnswers(JsonUtil.opt(toolContentJSON, "allowRateAnswers", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
+	qa.setMinimumRates(JsonUtil.optInt(toolContentJSON, RestTags.MINIMUM_RATES, 0));
+	qa.setMaximumRates(JsonUtil.optInt(toolContentJSON, RestTags.MAXIMUM_RATES, 0));
+	qa.setShowOtherAnswers(JsonUtil.optBoolean(toolContentJSON, "showOtherAnswers", Boolean.TRUE));
+	qa.setUsernameVisible(JsonUtil.optBoolean(toolContentJSON, "usernameVisible", Boolean.FALSE));
+	qa.setAllowRateAnswers(JsonUtil.optBoolean(toolContentJSON, "allowRateAnswers", Boolean.FALSE));
 	qa.setNotifyTeachersOnResponseSubmit(
-		JsonUtil.opt(toolContentJSON, "notifyTeachersOnResponseSubmit", Boolean.FALSE));
-	qa.setReflect(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	qa.setReflectionSubject(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
-	qa.setQuestionsSequenced(JsonUtil.opt(toolContentJSON, "questionsSequenced", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnResponseSubmit", Boolean.FALSE));
+	qa.setReflect(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	qa.setReflectionSubject(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	qa.setQuestionsSequenced(JsonUtil.optBoolean(toolContentJSON, "questionsSequenced", Boolean.FALSE));
 
 	// submissionDeadline is set in monitoring
 	// qa.setMonitoringReportTitle(); Can't find this field in the database - assuming unused.
@@ -1277,13 +1279,12 @@
 
 	saveOrUpdateQaContent(qa);
 	// Questions
-	JSONArray questions = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
-	for (int i = 0; i < questions.length(); i++) {
-	    JSONObject questionData = (JSONObject) questions.get(i);
-	    QaQueContent question = new QaQueContent(questionData.getString(RestTags.QUESTION_TEXT),
-		    questionData.getInt(RestTags.DISPLAY_ORDER), JsonUtil.opt(questionData, "feedback", (String) null),
-		    JsonUtil.opt(questionData, "required", Boolean.FALSE),
-		    JsonUtil.opt(questionData, "minWordsLimit", 0), qa);
+	ArrayNode questions = JsonUtil.optArray(toolContentJSON, RestTags.QUESTIONS);
+	for (JsonNode questionData : questions) {
+	    QaQueContent question = new QaQueContent(JsonUtil.optString(questionData, RestTags.QUESTION_TEXT),
+		    JsonUtil.optInt(questionData, RestTags.DISPLAY_ORDER), JsonUtil.optString(questionData, "feedback"),
+		    JsonUtil.optBoolean(questionData, "required", Boolean.FALSE),
+		    JsonUtil.optInt(questionData, "minWordsLimit", 0), qa);
 	    saveOrUpdateQuestion(question);
 	}
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java
===================================================================
diff -u -r51f3b0856ffbb784386faf0ccb30a75bff8a98b5 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision 51f3b0856ffbb784386faf0ccb30a75bff8a98b5)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -19,8 +19,6 @@
 http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
 
-
-
 package org.lamsfoundation.lams.tool.qa.web.action;
 
 import java.io.IOException;
@@ -39,13 +37,9 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.dto.RatingCommentDTO;
 import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
@@ -65,12 +59,14 @@
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Ozgur Demirtas
  */
 public class QaMonitoringAction extends LamsDispatchAction implements QaAppConstants {
-    private static Logger logger = Logger.getLogger(QaMonitoringAction.class.getName());
-
     @Override
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException, ToolException {
@@ -118,7 +114,7 @@
      * @param request
      * @param response
      * @return
-     * @throws IOException 
+     * @throws IOException
      */
     public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
@@ -187,7 +183,7 @@
      * @return
      */
     public ActionForward getReflectionsJSON(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, ToolException, JSONException {
+	    HttpServletResponse response) throws IOException, ServletException, ToolException {
 
 	Long toolSessionId = WebUtil.readLongParam(request, QaAppConstants.TOOL_SESSION_ID);
 
@@ -207,20 +203,20 @@
 	List<Object[]> users = qaService.getUserReflectionsForTablesorter(toolSessionId, page, size, sorting,
 		searchString);
 
-	JSONArray rows = new JSONArray();
-	JSONObject responsedata = new JSONObject();
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
+	ObjectNode responsedata = JsonNodeFactory.instance.objectNode();
 	responsedata.put("total_rows", qaService.getCountUsersBySessionWithSearch(toolSessionId, searchString));
 
 	for (Object[] userAndReflection : users) {
-	    JSONObject responseRow = new JSONObject();
+	    ObjectNode responseRow = JsonNodeFactory.instance.objectNode();
 	    responseRow.put("username", StringEscapeUtils.escapeHtml((String) userAndReflection[1]));
 	    if (userAndReflection.length > 2 && userAndReflection[2] != null) {
 		String reflection = StringEscapeUtils.escapeHtml((String) userAndReflection[2]);
 		responseRow.put(QaAppConstants.NOTEBOOK, reflection.replaceAll("\n", "<br>"));
 	    }
-	    rows.put(responseRow);
+	    rows.add(responseRow);
 	}
-	responsedata.put("rows", rows);
+	responsedata.set("rows", rows);
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().print(new String(responsedata.toString()));
 	return null;
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -46,9 +45,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.ITicket;
@@ -117,6 +113,10 @@
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Dapeng.Ni
  */
@@ -311,7 +311,7 @@
 	}
 	// add resource items from Authoring
 	Resource resource = session.getResource();
-	List<ResourceItem> items = new ArrayList<ResourceItem>();
+	List<ResourceItem> items = new ArrayList<>();
 	items.addAll(resource.getResourceItems());
 
 	// add resource items from ResourceSession
@@ -429,7 +429,7 @@
 
     @Override
     public List<SessionDTO> getSummary(Long contentId) {
-	List<SessionDTO> groupList = new ArrayList<SessionDTO>();
+	List<SessionDTO> groupList = new ArrayList<>();
 
 	Resource resource = resourceDao.getByContentId(contentId);
 
@@ -443,14 +443,14 @@
 	    group.setSessionId(session.getSessionId());
 	    group.setSessionName(session.getSessionName());
 
-	    Set<ResourceItem> items = new TreeSet<ResourceItem>(new ResourceItemComparator());
+	    Set<ResourceItem> items = new TreeSet<>(new ResourceItemComparator());
 	    // firstly, put all initial resource item into this group.
 	    items.addAll(resource.getResourceItems());
 	    // add this session's resource items
 	    items.addAll(session.getResourceItems());
 
 	    // item ids of items that could be rated.
-	    List<Long> itemsToRate = new ArrayList<Long>();
+	    List<Long> itemsToRate = new ArrayList<>();
 
 	    // get all item which is accessed by users in this session
 	    Map<Long, Integer> visitCountMap = resourceItemVisitDao.getSummary(contentId, session.getSessionId());
@@ -461,24 +461,25 @@
 		    resourceItemDTO.setViewNumber(visitCountMap.get(item.getUid()).intValue());
 		}
 		group.getItems().add(resourceItemDTO);
-		if ( item.isAllowRating() ) {
+		if (item.isAllowRating()) {
 		    itemsToRate.add(item.getUid());
 		}
 	    }
-	    
+
 	    List<ItemRatingDTO> itemRatingDtos = null;
-	    if ( itemsToRate.size() > 0 ) {
-		itemRatingDtos = ratingService.getRatingCriteriaDtos(contentId, session.getSessionId(), itemsToRate, false, -1L);
+	    if (itemsToRate.size() > 0) {
+		itemRatingDtos = ratingService.getRatingCriteriaDtos(contentId, session.getSessionId(), itemsToRate,
+			false, -1L);
 		group.setAllowRating(true);
 	    } else {
 		group.setAllowRating(false);
 	    }
 
-	    for (ResourceItemDTO item: group.getItems()) {
+	    for (ResourceItemDTO item : group.getItems()) {
 		if (item.isAllowRating()) {
 		    // find corresponding itemRatingDto
-		    for ( ItemRatingDTO ratingDTO : itemRatingDtos ) {
-			if ( item.getItemUid().equals(ratingDTO.getItemId()) ) {
+		    for (ItemRatingDTO ratingDTO : itemRatingDtos) {
+			if (item.getItemUid().equals(ratingDTO.getItemId())) {
 			    item.setRatingDTO(ratingDTO);
 			    break;
 			}
@@ -494,7 +495,7 @@
 
     @Override
     public List<ReflectDTO> getReflectList(Long contentId) {
-	List<ReflectDTO> reflections = new LinkedList<ReflectDTO>();
+	List<ReflectDTO> reflections = new LinkedList<>();
 
 	List<ResourceSession> sessionList = resourceSessionDao.getByContentId(contentId);
 	for (ResourceSession session : sessionList) {
@@ -530,7 +531,8 @@
 	    user.setAccessDate(visit.getAccessDate());
 	    user.setCompleteDate(visit.getCompleteDate());
 	    Date timeTaken = ((visit.getCompleteDate() != null) && (visit.getAccessDate() != null))
-		    ? new Date(visit.getCompleteDate().getTime() - visit.getAccessDate().getTime()) : null;
+		    ? new Date(visit.getCompleteDate().getTime() - visit.getAccessDate().getTime())
+		    : null;
 	    user.setTimeTaken(timeTaken);
 	    userList.add(user);
 	}
@@ -792,10 +794,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     // *******************************************************************************
@@ -868,13 +870,13 @@
 		item.setCreateBy(user);
 		useRatings = useRatings || item.isAllowRating();
 	    }
-	    
+
 	    Set<LearnerItemRatingCriteria> criterias = toolContentObj.getRatingCriterias();
 	    if (criterias != null) {
 		for (LearnerItemRatingCriteria criteria : criterias) {
 		    criteria.setToolContentId(toolContentId);
 		}
-	    } 
+	    }
 
 	    resourceDao.saveObject(toolContentObj);
 	} catch (ImportToolContentException e) {
@@ -1092,9 +1094,9 @@
 
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -1113,8 +1115,9 @@
     @Override
     public LearnerItemRatingCriteria createRatingCriteria(Long toolContentId) throws RatingException {
 	List<RatingCriteria> ratingCriterias = ratingService.getCriteriasByToolContentId(toolContentId);
-	if ( ratingCriterias == null || ratingCriterias.size() == 0 ) {
-	    return ratingService.saveLearnerItemRatingCriteria(toolContentId, null, 1, RatingCriteria.RATING_STYLE_STAR, false, 0);
+	if (ratingCriterias == null || ratingCriterias.size() == 0) {
+	    return ratingService.saveLearnerItemRatingCriteria(toolContentId, null, 1, RatingCriteria.RATING_STYLE_STAR,
+		    false, 0);
 	} else {
 	    return (LearnerItemRatingCriteria) ratingCriterias.get(0);
 	}
@@ -1124,9 +1127,10 @@
     public int deleteRatingCriteria(Long toolContentId) {
 	return ratingService.deleteAllRatingCriterias(toolContentId);
     }
-    
+
     @Override
-    public List<ItemRatingDTO> getRatingCriteriaDtos(Long toolContentId, Long toolSessionId, Collection<Long> itemIds, Long userId) {
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long toolContentId, Long toolSessionId, Collection<Long> itemIds,
+	    Long userId) {
 	return ratingService.getRatingCriteriaDtos(toolContentId, toolSessionId, itemIds, false, userId);
     }
 
@@ -1235,91 +1239,94 @@
 	if (learner == null) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null);
 	}
-	
+
 	Object[] dates = resourceItemVisitDao.getDateRangeOfAccesses(learner.getUid(), toolSessionId);
-	if (learner.isSessionFinished())
-	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, (Date)dates[0], (Date)dates[1]);
-	else
-	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED,(Date) dates[0], null);
+	if (learner.isSessionFinished()) {
+	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, (Date) dates[0], (Date) dates[1]);
+	} else {
+	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, (Date) dates[0], null);
+	}
     }
- 
+
     // ****************** REST methods *************************
 
     /**
      * Used by the Rest calls to create content. Mandatory fields in toolContentJSON: title, instructions, resources,
-     * user fields firstName, lastName and loginName Resources must contain a JSONArray of JSONObject objects, which
+     * user fields firstName, lastName and loginName Resources must contain a ArrayNode of ObjectNode objects, which
      * have the following mandatory fields: title, description, type. If there are instructions for a resource, the
-     * instructions are a JSONArray of Strings. There should be at least one resource object in the resources array.
+     * instructions are a ArrayNode of Strings. There should be at least one resource object in the resources array.
+     *
+     * @throws IOException
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON)
+	    throws IOException {
 
 	Date updateDate = new Date();
 
 	Resource resource = new Resource();
 	resource.setContentId(toolContentID);
-	resource.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	resource.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	resource.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	resource.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 	resource.setCreated(updateDate);
 
-	resource.setAllowAddFiles(JsonUtil.opt(toolContentJSON, "allowAddFiles", Boolean.FALSE));
-	resource.setAllowAddUrls(JsonUtil.opt(toolContentJSON, "allowAddUrls", Boolean.FALSE));
-	resource.setLockWhenFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	resource.setMiniViewResourceNumber(JsonUtil.opt(toolContentJSON, "minViewResourceNumber", 0));
+	resource.setAllowAddFiles(JsonUtil.optBoolean(toolContentJSON, "allowAddFiles", Boolean.FALSE));
+	resource.setAllowAddUrls(JsonUtil.optBoolean(toolContentJSON, "allowAddUrls", Boolean.FALSE));
+	resource.setLockWhenFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	resource.setMiniViewResourceNumber(JsonUtil.optInt(toolContentJSON, "minViewResourceNumber", 0));
 	resource.setNotifyTeachersOnAssigmentSumbit(
-		JsonUtil.opt(toolContentJSON, "notifyTeachersOnAssigmentSubmit", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnAssigmentSubmit", Boolean.FALSE));
 	resource.setNotifyTeachersOnAssigmentSumbit(
-		JsonUtil.opt(toolContentJSON, "notifyTeachersOnFileUpload", Boolean.FALSE));
-	resource.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	resource.setReflectInstructions(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
-	resource.setRunAuto(JsonUtil.opt(toolContentJSON, "runAuto", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnFileUpload", Boolean.FALSE));
+	resource.setReflectOnActivity(
+		JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	resource.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	resource.setRunAuto(JsonUtil.optBoolean(toolContentJSON, "runAuto", Boolean.FALSE));
 
 	resource.setContentInUse(false);
 	resource.setDefineLater(false);
 
 	ResourceUser resourceUser = getUserByIDAndContent(userID.longValue(), toolContentID);
 	if (resourceUser == null) {
 	    resourceUser = new ResourceUser();
-	    resourceUser.setFirstName(toolContentJSON.getString("firstName"));
-	    resourceUser.setLastName(toolContentJSON.getString("lastName"));
-	    resourceUser.setLoginName(toolContentJSON.getString("loginName"));
+	    resourceUser.setFirstName(JsonUtil.optString(toolContentJSON, "firstName"));
+	    resourceUser.setLastName(JsonUtil.optString(toolContentJSON, "lastName"));
+	    resourceUser.setLoginName(JsonUtil.optString(toolContentJSON, "loginName"));
 	    //   resourceUser.setResource(content);
 	}
 
 	resource.setCreatedBy(resourceUser);
 
 	// **************************** Handle topic *********************
-	JSONArray resources = toolContentJSON.getJSONArray("resources");
+	ArrayNode resources = JsonUtil.optArray(toolContentJSON, "resources");
 	Set itemList = new LinkedHashSet();
-	for (int i = 0; i < resources.length(); i++) {
-	    JSONObject itemData = (JSONObject) resources.get(i);
+	for (JsonNode itemData : resources) {
 	    ResourceItem item = new ResourceItem();
-	    item.setTitle(itemData.getString("title"));
-	    item.setType((short) itemData.getInt("type"));
+	    item.setTitle(JsonUtil.optString(itemData, "title"));
+	    item.setType(JsonUtil.optInt(itemData, "type").shortValue());
 	    item.setCreateBy(resourceUser);
 	    item.setCreateDate(updateDate);
 	    item.setComplete(false);
 	    item.setCreateByAuthor(true);
 	    item.setHide(false);
-	    item.setOrderId(itemData.getInt(RestTags.DISPLAY_ORDER));
+	    item.setOrderId(JsonUtil.optInt(itemData, RestTags.DISPLAY_ORDER));
 
-	    item.setDescription(JsonUtil.opt(itemData, "description", (String) null));
-	    item.setFileName(JsonUtil.opt(itemData, "name", (String) null));
-	    item.setFileType(JsonUtil.opt(itemData, "fileType", (String) null));
+	    item.setDescription(JsonUtil.optString(itemData, "description"));
+	    item.setFileName(JsonUtil.optString(itemData, "name"));
+	    item.setFileType(JsonUtil.optString(itemData, "fileType"));
 	    item.setFileUuid(JsonUtil.optLong(itemData, "crUuid"));
 	    item.setFileVersionId(JsonUtil.optLong(itemData, "crVersionId"));
-	    item.setImsSchema(JsonUtil.opt(itemData, "imsSchema", (String) null));
-	    item.setOrganizationXml(JsonUtil.opt(itemData, "organizationXml", (String) null));
-	    item.setOpenUrlNewWindow(JsonUtil.opt(itemData, "openUrlNewWindow", Boolean.FALSE));
-	    item.setUrl(JsonUtil.opt(itemData, "url", (String) null));
+	    item.setImsSchema(JsonUtil.optString(itemData, "imsSchema"));
+	    item.setOrganizationXml(JsonUtil.optString(itemData, "organizationXml"));
+	    item.setOpenUrlNewWindow(JsonUtil.optBoolean(itemData, "openUrlNewWindow", Boolean.FALSE));
+	    item.setUrl(JsonUtil.optString(itemData, "url"));
 
-	    JSONArray instructionStrings = itemData.getJSONArray("instructions");
-	    if ((instructionStrings != null) && (instructionStrings.length() > 0)) {
+	    ArrayNode instructionStrings = JsonUtil.optArray(itemData, "instructions");
+	    if ((instructionStrings != null) && (instructionStrings.size() > 0)) {
 		Set instructions = new LinkedHashSet();
-		for (int j = 0; j < instructionStrings.length(); j++) {
+		for (int j = 0; j < instructionStrings.size(); j++) {
 		    ResourceItemInstruction rii = new ResourceItemInstruction();
-		    rii.setDescription(instructionStrings.getString(j));
+		    rii.setDescription(instructionStrings.get(j).asText(null));
 		    rii.setSequenceId(j);
 		    instructions.add(rii);
 		}
@@ -1328,7 +1335,7 @@
 
 	    // TODO files - need to save it somehow, validate the file size, etc. Needed for websites, files & LO
 	    if ((item.getFileName() != null) || (item.getFileUuid() != null)) {
-		throw new JSONException(
+		throw new IOException(
 			"Only URLS supported via REST interface currently - files and learning objects are not supported.");
 	    }
 
@@ -1341,6 +1348,7 @@
 
     }
 
+    @Override
     public void evict(Object object) {
 	resourceDao.releaseFromCache(object);
     }
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -31,8 +31,6 @@
 import java.util.SortedMap;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.ITicket;
@@ -71,7 +69,10 @@
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.JsonUtil;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * An implementation of the ILeaderselectionService interface.
  *
@@ -161,7 +162,7 @@
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -338,7 +339,7 @@
     /* ********** ILeaderselectionService Methods ********************************* */
 
     @Override
-    public void setGroupLeader(Long userUid, Long toolSessionId) throws JSONException, IOException {
+    public void setGroupLeader(Long userUid, Long toolSessionId) throws IOException {
 	if ((userUid == null) || (toolSessionId == null)) {
 	    return;
 	}
@@ -621,14 +622,13 @@
      * Rest call to create a new Learner Selection content. Required fields in toolContentJSON: "title", "instructions".
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 	Date updateDate = new Date();
 
 	Leaderselection leaderselection = new Leaderselection();
 	leaderselection.setToolContentId(toolContentID);
-	leaderselection.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	leaderselection.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	leaderselection.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	leaderselection.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 	leaderselection.setCreateBy(userID.longValue());
 	leaderselection.setCreateDate(updateDate);
 	leaderselection.setUpdateDate(updateDate);
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.mindmap.service;
 
 import java.util.ArrayList;
@@ -33,8 +32,6 @@
 import java.util.SortedMap;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -79,8 +76,9 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.reflection.SunUnsafeReflectionProvider;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 
 /**
@@ -91,7 +89,7 @@
 
     private static Logger logger = Logger.getLogger(MindmapService.class.getName());
 
-    private final XStream xstream = new XStream(new SunUnsafeReflectionProvider());
+    private final XStream xstream = new XStream(new StaxDriver());
 
     private IMindmapDAO mindmapDAO = null;
     private IMindmapSessionDAO mindmapSessionDAO = null;
@@ -168,12 +166,12 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return getMindmapOutputFactory().getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -389,7 +387,7 @@
 
     @Override
     public String getLanguageXML() {
-	ArrayList<String> languageCollection = new ArrayList<String>();
+	ArrayList<String> languageCollection = new ArrayList<>();
 	languageCollection.add(new String("local.title"));
 	languageCollection.add(new String("local.delete_question"));
 	languageCollection.add(new String("local.yes"));
@@ -453,13 +451,13 @@
 	    return;
 	}
 
-	List<MindmapNode> nodesToDelete = new LinkedList<MindmapNode>();
+	List<MindmapNode> nodesToDelete = new LinkedList<>();
 	for (MindmapSession session : (Set<MindmapSession>) mindmap.getMindmapSessions()) {
 	    List<MindmapNode> nodes = mindmapNodeDAO.getMindmapNodesBySessionIdAndUserId(session.getSessionId(),
 		    userId.longValue());
 
 	    for (MindmapNode node : nodes) {
-		List<MindmapNode> descendants = new LinkedList<MindmapNode>();
+		List<MindmapNode> descendants = new LinkedList<>();
 		if ((node.getUser() != null) && node.getUser().getUserId().equals(userId.longValue())
 			&& !nodesToDelete.contains(node)
 			&& userOwnsChildrenNodes(node, userId.longValue(), descendants)) {
@@ -864,10 +862,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     public void setMindmapNodeDAO(IMindmapNodeDAO mindmapNodeDAO) {
@@ -1014,22 +1012,21 @@
      * (default false), reflectOnActivity (default false), reflectInstructions
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Mindmap content = new Mindmap();
 	Date updateDate = new Date();
 	content.setToolContentId(toolContentID);
 	content.setCreateDate(updateDate);
 	content.setUpdateDate(updateDate);
-	content.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	content.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	content.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	content.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 	content.setContentInUse(false);
 	content.setDefineLater(false);
-	content.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
-	content.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	content.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	content.setMultiUserMode(JsonUtil.opt(toolContentJSON, "multiUserMode", Boolean.FALSE));
+	content.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	content.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	content.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	content.setMultiUserMode(JsonUtil.optBoolean(toolContentJSON, "multiUserMode", Boolean.FALSE));
 
 	// createdBy and submissionDeadline are null in the database using the standard authoring module
 	// submissionDeadline is set in monitoring
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java	(.../NoticeboardService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java	(.../NoticeboardService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.noticeboard.service;
 
 import java.util.ArrayList;
@@ -32,8 +31,6 @@
 import java.util.TreeMap;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException;
@@ -67,6 +64,8 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.JsonUtil;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * An implementation of the NoticeboardService interface.
  *
@@ -276,10 +275,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -534,12 +533,12 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return null;
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<ToolOutput>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -636,22 +635,23 @@
 
 	return new ToolCompletionStatus(
 		NoticeboardUser.COMPLETED.equals(learner.getUserStatus()) ? ToolCompletionStatus.ACTIVITY_COMPLETED
-			: ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null);
+			: ToolCompletionStatus.ACTIVITY_ATTEMPTED,
+		null, null);
     }
 
     // ****************** REST methods *************************
 
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 	Date updateDate = new Date();
 
 	NoticeboardContent noticeboard = new NoticeboardContent();
 	noticeboard.setNbContentId(toolContentID);
-	noticeboard.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	noticeboard.setContent(toolContentJSON.getString("content"));
-	noticeboard.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	noticeboard.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
+	noticeboard.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	noticeboard.setContent(JsonUtil.optString(toolContentJSON, "content"));
+	noticeboard.setReflectOnActivity(
+		JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	noticeboard.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
 
 	noticeboard.setCreatorUserId(userID.longValue());
 	noticeboard.setDateCreated(updateDate);
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.notebook.service;
 
 import java.util.ArrayList;
@@ -33,8 +32,6 @@
 import java.util.SortedMap;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.events.IEventNotificationService;
@@ -73,6 +70,8 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * An implementation of the INotebookService interface.
  *
@@ -165,12 +164,12 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return getNotebookOutputFactory().getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -644,10 +643,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -659,7 +658,7 @@
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getNotebookOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
-    
+
     @Override
     public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
 	// db doesn't have a start/finish date for learner, and session start/finish is null
@@ -678,20 +677,19 @@
      * Rest call to create a new Notebook content. Required fields in toolContentJSON: "title", "instructions".
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 	Date updateDate = new Date();
 
 	Notebook nb = new Notebook();
 	nb.setToolContentId(toolContentID);
-	nb.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	nb.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	nb.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	nb.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 	nb.setCreateBy(userID.longValue());
 	nb.setCreateDate(updateDate);
 	nb.setUpdateDate(updateDate);
 
-	nb.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	nb.setAllowRichEditor(JsonUtil.opt(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
+	nb.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	nb.setAllowRichEditor(JsonUtil.optBoolean(toolContentJSON, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
 	// submissionDeadline is set in monitoring
 
 	nb.setContentInUse(false);
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -r58de3acfcde3052a939146df7d0172599e56633a -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 58de3acfcde3052a939146df7d0172599e56633a)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -42,9 +42,6 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -89,6 +86,9 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Andrey Balan
  */
@@ -224,7 +224,7 @@
 
     @Override
     public List<GroupSummary> getGroupSummaries(Long contentId) {
-	List<GroupSummary> groupList = new ArrayList<GroupSummary>();
+	List<GroupSummary> groupList = new ArrayList<>();
 
 	// get all sessions in a peerreview and retrieve all peerreview items under this session
 	// plus initial peerreview items by author creating (resItemList)
@@ -246,7 +246,7 @@
     public int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId) {
 	return peerreviewUserDao.getCountUsersBySession(toolSessionId, excludeUserId);
     }
-    
+
     @Override
     public int getCountUsersBySession(final Long toolSessionId) {
 	return peerreviewUserDao.getCountUsersBySession(toolSessionId);
@@ -321,23 +321,25 @@
 	if (user == null) {
 	    return;
 	}
-	
+
 	//If user is marked as hidden - it will automatically remove all rating left by him to prevent statistics mess up.
 	if (isHidden) {
 	    ratingService.removeUserCommitsByContent(toolContentId, user.getUserId().intValue());
 	}
-	
+
 	user.setHidden(isHidden);
 	peerreviewUserDao.saveObject(user);
     }
 
     @Override
-    public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Map<Long, Float> newRatings) {
+    public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId,
+	    Map<Long, Float> newRatings) {
 	return ratingService.rateItems(ratingCriteria, toolSessionId, userId, newRatings);
     }
 
     @Override
-    public void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId, String comment) {
+    public void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId,
+	    String comment) {
 	ratingService.commentItem(ratingCriteria, toolSessionId, userId, itemId, comment);
     }
 
@@ -360,17 +362,17 @@
 		userManagementService);
 
 	for (Object[] raw : rawData) {
-	    raw[raw.length - 2] = (Object) StringEscapeUtils.escapeCsv((String)raw[raw.length - 2]);
+	  raw[raw.length - 2] = (Object) StringEscapeUtils.escapeCsv((String)raw[raw.length - 2]);
 	}
 	// if !getByUser -> is get current user's ratings from other users ->
 	// convertToStyledJSON.getAllUsers needs to be true otherwise current user (the only one in the set!) is dropped
 	return ratingService.convertToStyledDTO(criteria, currentUserId, !getByUser || getAllUsers, rawData);
     }
 
     @Override
-    public JSONArray getUsersRatingsCommentsByCriteriaIdJSON(Long toolContentId, Long toolSessionId,
+    public ArrayNode getUsersRatingsCommentsByCriteriaIdJSON(Long toolContentId, Long toolSessionId,
 	    RatingCriteria criteria, Long currentUserId, Integer page, Integer size, int sorting, String searchString,
-	    boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException {
+	    boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) {
 
 	List<Object[]> rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria,
 		currentUserId, page, size, sorting, searchString, getByUser, ratingService, userManagementService);
@@ -380,8 +382,8 @@
 	}
 	// if !getByUser -> is get current user's ratings from other users ->
 	// convertToStyledJSON.getAllUsers needs to be true otherwise current user (the only one in the set!) is dropped
-	return ratingService.convertToStyledJSON(criteria, toolSessionId, currentUserId, !getByUser || getAllUsers, rawData,
-		needRatesPerUser);
+	return ratingService.convertToStyledJSON(criteria, toolSessionId, currentUserId, !getByUser || getAllUsers,
+		rawData, needRatesPerUser);
     }
 
     @Override
@@ -394,10 +396,10 @@
 	List<Object[]> rawData = peerreviewUserDao.getDetailedRatingsComments(toolContentId, toolSessionId, criteriaId,
 		itemId);
 	for (Object[] raw : rawData) {
-	    raw[2] = (raw[2] == null ? null : numberFormat.format((Float) raw[2])); // format rating
+	    raw[2] = (raw[2] == null ? null : numberFormat.format(raw[2])); // format rating
 	    // format name
 	    StringBuilder description = new StringBuilder((String) raw[3]).append(" ").append((String) raw[4]);
-	    raw[4] = (Object) StringEscapeUtils.escapeCsv(description.toString());
+	    raw[4] = StringEscapeUtils.escapeCsv(description.toString());
 
 	}
 	return rawData;
@@ -422,10 +424,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -446,7 +448,7 @@
 
 	for (Object[] raw : rawData) {
 	    StringBuilder description = new StringBuilder((String) raw[1]).append(" ").append((String) raw[2]);
-	    raw[2] = (Object) StringEscapeUtils.escapeCsv(description.toString());
+	    raw[2] = StringEscapeUtils.escapeCsv(description.toString());
 	}
 
 	return rawData;
@@ -460,10 +462,9 @@
 
     private String getResultsEmailSubject(Peerreview peerreview) {
 	return getLocalisedMessage("event.sent.results.subject", new Object[] { peerreview.getTitle() });
-    }
+	    }
 
-
-    @Override
+   @Override
     public int emailReportToUser(Long toolContentId, Long sessionId, Long userId) {
 	PeerreviewSession session = peerreviewSessionDao.getSessionBySessionId(sessionId);
 	Peerreview peerreview = getPeerreviewByContentId(toolContentId);
@@ -489,7 +490,7 @@
 	}
 	return emails.size();
     }
-
+    
     @Override
     @SuppressWarnings("unchecked")
     public LinkedHashMap<String, ExcelCell[][]> exportTeamReportSpreadsheet(Long toolContentId) {
@@ -509,9 +510,10 @@
     public int[] getNumberPossibleRatings(Long toolContentId, Long toolSessionId, Long userId) {
 	int[] retValue = new int[2];
 
-	ArrayList<Long> itemIds = new ArrayList<Long>(1);
+	ArrayList<Long> itemIds = new ArrayList<>(1);
 	itemIds.add(userId);
-	Map<Long, Long> numRatingsForUserMap = ratingService.countUsersRatedEachItem(toolContentId, toolSessionId, itemIds, -1);
+	Map<Long, Long> numRatingsForUserMap = ratingService.countUsersRatedEachItem(toolContentId, toolSessionId,
+		itemIds, -1);
 	Long numRatingsForUser = numRatingsForUserMap.get(userId);
 	retValue[0] = numRatingsForUser != null ? numRatingsForUser.intValue() : 0;
 
@@ -632,7 +634,7 @@
     @Override
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
 	    throws ToolException {
-	return new TreeMap<String, ToolOutputDefinition>();
+	return new TreeMap<>();
     }
 
     @Override
@@ -806,17 +808,18 @@
     @Override
     public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
-	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, userId);
+	return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired,
+		userId);
     }
 
     @Override
     public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId, boolean isCountUsersRatedEachItem) {
-	List<ItemRatingDTO> itemRatingDTOs = getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired,
-		userId);
+	List<ItemRatingDTO> itemRatingDTOs = getRatingCriteriaDtos(contentId, toolSessionId, itemIds,
+		isCommentsByOtherUsersRequired, userId);
 
 	if (isCountUsersRatedEachItem) {
-	    Map<Long, Long> itemIdToRatedUsersCountMap = ratingService.countUsersRatedEachItem(contentId, toolSessionId, 
+	    Map<Long, Long> itemIdToRatedUsersCountMap = ratingService.countUsersRatedEachItem(contentId, toolSessionId,
 		    itemIds, userId.intValue());
 
 	    for (ItemRatingDTO itemRatingDTO : itemRatingDTOs) {
@@ -835,6 +838,7 @@
 	return ratingService.getCountItemsRatedByUser(toolContentId, userId);
     }
 
+    @Override
     public int getCountItemsRatedByUserByCriteria(final Long criteriaId, final Integer userId) {
 	return ratingService.getCountItemsRatedByUserByCriteria(criteriaId, userId);
     }
@@ -858,7 +862,7 @@
 
     @Override
     public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
-	return new TreeMap<String, ToolOutput>();
+	return new TreeMap<>();
     }
 
     @Override
@@ -868,9 +872,9 @@
 
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -954,35 +958,36 @@
 
     /**
      * Used by the Rest calls to create content. Mandatory fields in toolContentJSON: title, instructions, peerreview,
-     * user fields firstName, lastName and loginName Peerreview must contain a JSONArray of JSONObject objects, which
+     * user fields firstName, lastName and loginName Peerreview must contain a ArrayNode of ObjectNode objects, which
      * have the following mandatory fields: title, description, type. If there are instructions for a peerreview, the
-     * instructions are a JSONArray of Strings. There should be at least one peerreview object in the peerreview array.
+     * instructions are a ArrayNode of Strings. There should be at least one peerreview object in the peerreview array.
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Date updateDate = new Date();
 
 	Peerreview peerreview = new Peerreview();
 	peerreview.setContentId(toolContentID);
-	peerreview.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	peerreview.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	peerreview.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	peerreview.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 	peerreview.setCreated(updateDate);
 
-	peerreview.setLockWhenFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	peerreview.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	peerreview.setReflectInstructions(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
+	peerreview
+		.setLockWhenFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	peerreview.setReflectOnActivity(
+		JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	peerreview.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
 
 	peerreview.setContentInUse(false);
 	peerreview.setDefineLater(false);
 
 	PeerreviewUser peerreviewUser = getUserByIDAndContent(userID.longValue(), toolContentID);
 	if (peerreviewUser == null) {
 	    peerreviewUser = new PeerreviewUser();
-	    peerreviewUser.setFirstName(toolContentJSON.getString("firstName"));
-	    peerreviewUser.setLastName(toolContentJSON.getString("lastName"));
-	    peerreviewUser.setLoginName(toolContentJSON.getString("loginName"));
+	    peerreviewUser.setFirstName(JsonUtil.optString(toolContentJSON, "firstName"));
+	    peerreviewUser.setLastName(JsonUtil.optString(toolContentJSON, "lastName"));
+	    peerreviewUser.setLoginName(JsonUtil.optString(toolContentJSON, "loginName"));
 	    // peerreviewUser.setPeerreview(content);
 	}
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r160dbb3543d48c28016c41a003d265b1195cad47 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 160dbb3543d48c28016c41a003d265b1195cad47)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,8 +21,6 @@
  * ****************************************************************
  */
 
-
-
 package org.lamsfoundation.lams.tool.sbmt.service;
 
 import java.io.FileNotFoundException;
@@ -44,8 +42,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
 import org.lamsfoundation.lams.contentrepository.ITicket;
@@ -106,6 +102,8 @@
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.springframework.dao.DataAccessException;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Manpreet Minhas
  */
@@ -247,20 +245,22 @@
 	    List<SubmissionDetails> submissions = submissionDetailsDAO.getBySessionAndLearner(session.getSessionID(),
 		    userId);
 	    submissionDetailsDAO.deleteAll(submissions);
+
 	    SubmitUser user = submitUserDAO.getLearner(session.getSessionID(), userId);
 	    if (user != null) {
 		NotebookEntry entry = getEntry(session.getSessionID(), CoreNotebookConstants.NOTEBOOK_TOOL,
 			SbmtConstants.TOOL_SIGNATURE, userId);
 		if (entry != null) {
 		    submitFilesContentDAO.delete(entry);
 		}
+
 		gradebookService.updateActivityMark(null, null, user.getUserID(), session.getSessionID(), false);
 
 		submitUserDAO.delete(user);
 	    }
 	}
     }
-    
+
  
     
     @Override
@@ -558,12 +558,12 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return getSubmitFilesOutputFactory().getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -649,7 +649,8 @@
      *      java.lang.Long)
      */
     @Override
-    public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale, boolean includeRemovedFiles) {
+    public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale,
+	    boolean includeRemovedFiles) {
 	List<SubmissionDetails> list = submissionDetailsDAO.getBySessionAndLearner(sessionID, userID);
 	SortedSet details = new TreeSet(this.new FileDtoComparator());
 	if (list == null) {
@@ -658,7 +659,7 @@
 
 	NumberFormat numberFormat = currentLocale != null ? NumberFormat.getInstance(currentLocale) : null;
 	for (SubmissionDetails submissionDetails : list) {
-	    if ( includeRemovedFiles || ! submissionDetails.isRemoved() ) {
+	    if (includeRemovedFiles || !submissionDetails.isRemoved()) {
 		FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails, numberFormat);
 		details.add(detailDto);
 	    }
@@ -727,8 +728,8 @@
     @Override
     public void updateMarks(Long reportID, Float marks, String comments, FormFile markFile, Long sessionID)
 	    throws InvalidParameterException, RepositoryCheckedException {
+
 	
-	
 	SubmitFilesSession session = getSessionById(sessionID);
 	SubmitFilesContent content = session.getContent();
 	if (content.isUseSelectLeaderToolOuput()) {
@@ -769,36 +770,36 @@
 
 	}
 	else{
-        	IToolContentHandler toolContentHandler = getSbmtToolContentHandler();
-        	SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
-        	if (report != null) {
-        	    report.setComments(comments);
-        	    report.setMarks(marks);
-        
-        	    // If there is a new file, delete the existing and add the mark file
-        	    if ((markFile != null) && !StringUtils.isEmpty(markFile.getFileName())) {
-        
-        		// Delete the existing
-        		if (report.getMarkFileUUID() != null) {
-        		    toolContentHandler.deleteFile(report.getMarkFileUUID());
-        		    report.setMarkFileName(null);
-        		    report.setMarkFileUUID(null);
-        		    report.setMarkFileVersionID(null);
-        		}
-        
-        		// Add the new file
-        		NodeKey nodeKey = this.processFile(markFile);
-        		// NodeKey nodeKey = toolContentHandler.uploadFile(marksFileInputStream, marksFileName, null,
-        		// IToolContentHandler.TYPE_ONLINE);
-        
-        		report.setMarkFileName(markFile.getFileName());
-        		report.setMarkFileUUID(nodeKey.getUuid());
-        		report.setMarkFileVersionID(nodeKey.getVersion());
-        	    }
-        
-        	    submitFilesReportDAO.update(report);
-        	}
+	IToolContentHandler toolContentHandler = getSbmtToolContentHandler();
+	SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
+	if (report != null) {
+	    report.setComments(comments);
+	    report.setMarks(marks);
+
+	    // If there is a new file, delete the existing and add the mark file
+	    if ((markFile != null) && !StringUtils.isEmpty(markFile.getFileName())) {
+
+		// Delete the existing
+		if (report.getMarkFileUUID() != null) {
+		    toolContentHandler.deleteFile(report.getMarkFileUUID());
+		    report.setMarkFileName(null);
+		    report.setMarkFileUUID(null);
+		    report.setMarkFileVersionID(null);
+		}
+
+		// Add the new file
+		NodeKey nodeKey = this.processFile(markFile);
+		// NodeKey nodeKey = toolContentHandler.uploadFile(marksFileInputStream, marksFileName, null,
+		// IToolContentHandler.TYPE_ONLINE);
+
+		report.setMarkFileName(markFile.getFileName());
+		report.setMarkFileUUID(nodeKey.getUuid());
+		report.setMarkFileVersionID(nodeKey.getVersion());
+	    }
+
+	    submitFilesReportDAO.update(report);
 	}
+	}
 
     }
 
@@ -814,16 +815,15 @@
 	}
     }
 
- 
     @Override
     public void removeLearnerFile(Long detailID, UserDTO monitor) {
 
 	SubmissionDetails detail = submissionDetailsDAO.getSubmissionDetailsByID(detailID);
 
 	if (detail != null) {
-	    if(monitor != null){
+	    if (monitor != null) {
 
-	    auditRemoveRestore(monitor, detail, "audit.file.delete");
+		auditRemoveRestore(monitor, detail, "audit.file.delete");
 	    }
 
 	    detail.setRemoved(true);
@@ -833,13 +833,13 @@
 
     @Override
     public void restoreLearnerFile(Long detailID, UserDTO monitor) {
-	
+
 	SubmissionDetails detail = submissionDetailsDAO.getSubmissionDetailsByID(detailID);
 
 	if (detail != null) {
-	    
-	    auditRemoveRestore(monitor, detail,"audit.file.restore");
-	    
+
+	    auditRemoveRestore(monitor, detail, "audit.file.restore");
+
 	    detail.setRemoved(false);
 	    submissionDetailsDAO.update(detail);
 	}
@@ -848,17 +848,16 @@
 
     private void auditRemoveRestore(UserDTO monitor, SubmissionDetails detail, String i18nKey) {
 	SubmitUser learner = detail.getLearner();
-	StringBuilder instructorTxt = new StringBuilder(monitor.getLogin()).append(" (").append(monitor.getUserID()).append(") ")
-	    .append(monitor.getFirstName()).append(" ").append(monitor.getLastName());
-	StringBuilder learnerTxt = new StringBuilder(learner.getLogin()).append("  (").append(learner.getUserID()).append(") ")
-	    .append(learner.getFirstName()).append(" ").append(learner.getLastName());
+	StringBuilder instructorTxt = new StringBuilder(monitor.getLogin()).append(" (").append(monitor.getUserID())
+		.append(") ").append(monitor.getFirstName()).append(" ").append(monitor.getLastName());
+	StringBuilder learnerTxt = new StringBuilder(learner.getLogin()).append("  (").append(learner.getUserID())
+		.append(") ").append(learner.getFirstName()).append(" ").append(learner.getLastName());
 
-	String auditMsg = getLocalisedMessage(i18nKey, new Object[] { instructorTxt.toString(), detail.getFilePath(),
-	    learnerTxt.toString() });
+	String auditMsg = getLocalisedMessage(i18nKey,
+		new Object[] { instructorTxt.toString(), detail.getFilePath(), learnerTxt.toString() });
 	auditService.log(SbmtConstants.AUDIT_LOG_MODULE_NAME, auditMsg);
     }
 
-
     @Override
     public IVersionedNode downloadFile(Long uuid, Long versionID) throws SubmitFilesException {
 	ITicket ticket = getRepositoryLoginTicket();
@@ -895,14 +894,14 @@
 	Map<Integer, StringBuilder> notificationMessages = null;
 	Object[] notificationMessageParameters = null;
 	if (notifyLearnersOnMarkRelease) {
-	    notificationMessages = new TreeMap<Integer, StringBuilder>();
+	    notificationMessages = new TreeMap<>();
 	    notificationMessageParameters = new Object[3];
 	}
 	while (iter.hasNext()) {
 	    details = (SubmissionDetails) iter.next();
 	    report = details.getReport();
 	    report.setDateMarksReleased(new Date());
-	    if (notifyLearnersOnMarkRelease && ! details.isRemoved()) {
+	    if (notifyLearnersOnMarkRelease && !details.isRemoved()) {
 		SubmitUser user = details.getLearner();
 		StringBuilder notificationMessage = notificationMessages.get(user.getUserID());
 		if (notificationMessage == null) {
@@ -972,7 +971,7 @@
 	if (detailsList != null) {
 	    Float totalMark = null;
 	    for (SubmissionDetails details : detailsList) {
-		if ( ! details.isRemoved() ) {
+		if (!details.isRemoved()) {
 		    SubmitFilesReport report = details.getReport();
 		    if (report != null) {
 			if (totalMark == null) {
@@ -1054,10 +1053,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -1106,8 +1105,8 @@
     public List<StatisticDTO> getStatisticsBySession(final Long contentId) {
 	return submitUserDAO.getStatisticsBySession(contentId);
     }
+
     
-    
     @Override
     public List<StatisticDTO> getLeaderStatisticsBySession(final Long contentId) {
 	return submitUserDAO.getLeaderStatisticsBySession(contentId);
@@ -1261,8 +1260,8 @@
     public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 	this.coreNotebookService = coreNotebookService;
     }
+
     
-    
     public IUserManagementService getUserManagementService() {
    	return userManagementService;
     }
@@ -1290,11 +1289,11 @@
     }
 
     public IAuditService getAuditService() {
-        return auditService;
+	return auditService;
     }
 
     public void setAuditService(IAuditService auditService) {
-        this.auditService = auditService;
+	this.auditService = auditService;
     }
 
     public void setGradebookService(IGradebookService gradebookService) {
@@ -1314,7 +1313,7 @@
     public void setSubmitFilesOutputFactory(SubmitFilesOutputFactory submitFilesOutputFactory) {
 	this.submitFilesOutputFactory = submitFilesOutputFactory;
     }
-    
+
     @Override
     public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) {
 	SubmitUser learner = getSessionUser(toolSessionId, learnerId.intValue());
@@ -1325,20 +1324,23 @@
 	Date startDate = null;
 	Date endDate = null;
 	List<SubmissionDetails> list = submissionDetailsDAO.getBySessionAndLearner(toolSessionId, learnerId.intValue());
-	for ( SubmissionDetails detail : list ) {
+	for (SubmissionDetails detail : list) {
 	    Date newDate = detail.getDateOfSubmission();
-	    if ( newDate != null ) {
-		if ( startDate == null || newDate.before(startDate) )
+	    if (newDate != null) {
+		if (startDate == null || newDate.before(startDate)) {
 		    startDate = newDate;
-		if ( endDate == null || newDate.after(endDate) )
+		}
+		if (endDate == null || newDate.after(endDate)) {
 		    endDate = newDate;
+		}
 	    }
 	}
-	
-	if (learner.isFinished())
+
+	if (learner.isFinished()) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate);
-	else
+	} else {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);
+	}
     }
 
     // ****************** REST methods *************************
@@ -1347,43 +1349,43 @@
      * Used by the Rest calls to create content. Mandatory fields in toolContentJSON: title, instructions
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	SubmitFilesContent content = new SubmitFilesContent();
 	Date updateDate = new Date();
 	content.setCreated(updateDate);
 	content.setUpdated(updateDate);
 
 	content.setContentID(toolContentID);
-	content.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	content.setInstruction(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	content.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	content.setInstruction(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 
 	content.setContentInUse(false);
 	content.setDefineLater(false);
 	content.setNotifyTeachersOnFileSubmit(
-		JsonUtil.opt(toolContentJSON, "notifyTeachersOnFileSubmit", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnFileSubmit", Boolean.FALSE));
 	content.setNotifyLearnersOnMarkRelease(
-		JsonUtil.opt(toolContentJSON, "notifyLearnersOnMarkRelease", Boolean.FALSE));
-	content.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
-	content.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	content.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	content.setLimitUpload(JsonUtil.opt(toolContentJSON, "limitUpload", Boolean.FALSE));
-	content.setUseSelectLeaderToolOuput(JsonUtil.opt(toolContentJSON, "useSelectLeaderToolOuput", Boolean.FALSE));
-	content.setLimitUploadNumber(JsonUtil.opt(toolContentJSON, "limitUploadNumber", 0));
+		JsonUtil.optBoolean(toolContentJSON, "notifyLearnersOnMarkRelease", Boolean.FALSE));
+	content.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	content.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	content.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	content.setLimitUpload(JsonUtil.optBoolean(toolContentJSON, "limitUpload", Boolean.FALSE));
+	content.setUseSelectLeaderToolOuput(JsonUtil.optBoolean(toolContentJSON, "useSelectLeaderToolOuput", Boolean.FALSE));
+	content.setLimitUploadNumber(JsonUtil.optInt(toolContentJSON, "limitUploadNumber", 0));
 	// submissionDeadline is set in monitoring
 
 	SubmitUser user = getContentUser(toolContentID, userID);
 	if (user == null) {
-	    user = createContentUser(userID, toolContentJSON.getString("firstName"),
-		    toolContentJSON.getString("lastName"), toolContentJSON.getString("loginName"), toolContentID);
+	    user = createContentUser(userID, JsonUtil.optString(toolContentJSON, "firstName"),
+		    JsonUtil.optString(toolContentJSON, "lastName"), JsonUtil.optString(toolContentJSON, "loginName"),
+		    toolContentID);
 	}
 	content.setCreatedBy(user);
 	saveOrUpdateContent(content);
 
     }
+
     
-    
     @Override
     public SubmitUser checkLeaderSelectToolForSessionLeader(SubmitUser user, Long toolSessionId) {
 	if ((user == null) || (toolSessionId == null)) {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java
===================================================================
diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 1688016bbb43db756bca9b93361c2a3833089d12)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -49,9 +49,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.DynaActionForm;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.tool.sbmt.SbmtConstants;
 import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
@@ -73,6 +70,10 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Manpreet Minhas
  */
@@ -154,7 +155,7 @@
 
     /** Ajax call to populate the tablesorter */
     public ActionForward getUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException {
+	    HttpServletResponse response) throws IOException {
 
 	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
@@ -183,8 +184,8 @@
 	List<Object[]> users = service.getUsersForTablesorter(sessionID, page, size, sorting, searchString,
 		spreadsheet.isReflectOnActivity());
 
-	JSONArray rows = new JSONArray();
-	JSONObject responsedata = new JSONObject();
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
+	ObjectNode responsedata = JsonNodeFactory.instance.objectNode();
 	responsedata.put("total_rows", service.getCountUsersBySession(sessionID, searchString));
 	SubmitUser groupLeader = new SubmitUser();
 	 if (spreadsheet.isUseSelectLeaderToolOuput()) {
@@ -193,35 +194,36 @@
 	 }
 	for (Object[] userAndReflection : users) {
 
-	    JSONObject responseRow = new JSONObject();
+	    ObjectNode responseRow = JsonNodeFactory.instance.objectNode();
 
 	    SubmitUser user = (SubmitUser) userAndReflection[0];
 	    responseRow.put(SbmtConstants.ATTR_USER_UID, user.getUid());
 	    responseRow.put(SbmtConstants.USER_ID, user.getUserID());
 	    responseRow.put(SbmtConstants.ATTR_USER_FULLNAME, StringEscapeUtils.escapeHtml(user.getFullName()));
 
-	    if (userAndReflection.length > 2) {
+
+    	    if (userAndReflection.length > 2) {
 		responseRow.put(SbmtConstants.ATTR_PORTRAIT_ID, (Integer)userAndReflection[1]);
 	    }
-
+	    
 	    if (userAndReflection.length > 3) {
-		responseRow.put(SbmtConstants.ATTR_USER_NUM_FILE, 
-			(Integer)userAndReflection[2] - (Integer)userAndReflection[3]);
+		responseRow.put(SbmtConstants.ATTR_USER_NUM_FILE,
+			(Integer) userAndReflection[2] - (Integer) userAndReflection[3]);
 	    }
 
 	    if (userAndReflection.length > 4) {
 		responseRow.put(SbmtConstants.ATTR_USER_FILE_MARKED, (Integer) userAndReflection[4] > 0);
 	    }
 
 	    if (userAndReflection.length > 5) {
-		responseRow.put(SbmtConstants.ATTR_USER_REFLECTION, userAndReflection[5]);
+		responseRow.put(SbmtConstants.ATTR_USER_REFLECTION, (String) userAndReflection[5]);
 	    }
 	    if(!spreadsheet.isUseSelectLeaderToolOuput()|| (spreadsheet.isUseSelectLeaderToolOuput() && groupLeader==user)){
-		rows.put(responseRow);
-	    }
+	    rows.add(responseRow);
 	}
+	}
 
-	responsedata.put("rows", rows);
+	responsedata.set("rows", rows);
 	response.setContentType("application/json;charset=utf-8");
 	response.getWriter().print(new String(responsedata.toString()));
 	return null;
@@ -256,10 +258,10 @@
 	    request.setAttribute("statisticList", statistics);
 	}
 	else{
-    	statistics.addAll(submitFilesService.getStatisticsBySession(contentID));
-    	request.setAttribute("statisticList", statistics);
-	}
+	statistics.addAll(submitFilesService.getStatisticsBySession(contentID));
+	request.setAttribute("statisticList", statistics);
     }
+    }
 
     /**
      * Release mark
@@ -526,7 +528,8 @@
 		    .append("file as file does not exist. Requested by user ").append(currentUser.getUserID())
 		    .append(" for file ").append(detailID).append(" for user ").append(learnerUserID);
 	    log.error(builder.toString());
-	    throw new ServletException("Invalid call to "+(remove ? "remove" : "restore")+" file. See the server log for more details.");
+	    throw new ServletException("Invalid call to " + (remove ? "remove" : "restore")
+		    + " file. See the server log for more details.");
 	} else {
 
 	    if (!fileToProcess.getSubmitFileSession().getSessionID().equals(sessionID)
@@ -536,17 +539,19 @@
 			.append(currentUser.getUserID()).append(" for file ").append(detailID).append(" for user ")
 			.append(learnerUserID).append(" in session ").append(sessionID);
 		log.error(builder.toString());
-		throw new ServletException("Invalid call to "+(remove ? "remove" : "restore")+" file. See the server log for more details.");
+		throw new ServletException("Invalid call to " + (remove ? "remove" : "restore")
+			+ " file. See the server log for more details.");
 	    } else {
 
 		if (remove) {
 		    submitFilesService.removeLearnerFile(detailID, currentUser);
-		    notifyRemoveRestore(fileToProcess, "event.file.restore.subject", "event.file.restore.body", "restore file");
+		    notifyRemoveRestore(fileToProcess, "event.file.restore.subject", "event.file.restore.body",
+			    "restore file");
 
-
 		} else {
 		    submitFilesService.restoreLearnerFile(detailID, currentUser);
-		    notifyRemoveRestore(fileToProcess, "event.file.delete.subject", "event.file.delete.body", "delete file");
+		    notifyRemoveRestore(fileToProcess, "event.file.delete.subject", "event.file.delete.body",
+			    "delete file");
 		}
 
 	    }
@@ -559,36 +564,41 @@
 	return mapping.findForward("listMark");
     }
 
-    /** Notify the user by email of the file change. Need to do it here rather than in the service so that any issues are caught and logged
-     * without stuffing up the transaction. 
+    /**
+     * Notify the user by email of the file change. Need to do it here rather than in the service so that any issues are
+     * caught and logged
+     * without stuffing up the transaction.
      */
-    public void notifyRemoveRestore(SubmissionDetails detail, String i18nSubjectKey, String i18nBodyKey, String errorSubject) {
+    public void notifyRemoveRestore(SubmissionDetails detail, String i18nSubjectKey, String i18nBodyKey,
+	    String errorSubject) {
 	Long contentID = detail.getSubmitFileSession().getContent().getContentID();
 	Integer learnerID = detail.getLearner().getUserID();
 
-	// Can't just create a new subscription then call triggerForSingleUser() as 
-	// it needs a subscription id, which doesn't exist for a subscription created in the same 
+	// Can't just create a new subscription then call triggerForSingleUser() as
+	// it needs a subscription id, which doesn't exist for a subscription created in the same
 	// transaction. So reuse the existing RELEASE MARKS event and subscription (created when
 	// a file is uploaded) and override both the subject and the message.
 
 	try {
-	    boolean eventExists = submitFilesService.getEventNotificationService().eventExists(SbmtConstants.TOOL_SIGNATURE,
-		    SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, contentID);
+	    boolean eventExists = submitFilesService.getEventNotificationService().eventExists(
+		    SbmtConstants.TOOL_SIGNATURE, SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, contentID);
 
 	    if (eventExists) {
 		submitFilesService.getEventNotificationService().triggerForSingleUser(SbmtConstants.TOOL_SIGNATURE,
 			SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, contentID, learnerID,
 			submitFilesService.getLocalisedMessage(i18nSubjectKey, null),
 			submitFilesService.getLocalisedMessage(i18nBodyKey, new Object[] { detail.getFilePath() }));
 	    } else {
-		log.error("Unable to notify user of "+errorSubject+". contentID="+contentID+" learner="+learnerID+" file "+detail.getFilePath()+" as "+SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE+" event is missing");
+		log.error("Unable to notify user of " + errorSubject + ". contentID=" + contentID + " learner="
+			+ learnerID + " file " + detail.getFilePath() + " as "
+			+ SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE + " event is missing");
 	    }
-	}  catch ( Exception e) {
-            log.error("Unable to notify user of "+errorSubject+". contentID="+contentID+" learner="+learnerID+" file "+detail.getFilePath()+" due to exception "+e.getMessage(),e);
-        }
+	} catch (Exception e) {
+	    log.error("Unable to notify user of " + errorSubject + ". contentID=" + contentID + " learner=" + learnerID
+		    + " file " + detail.getFilePath() + " due to exception " + e.getMessage(), e);
+	}
     }
 
-
     // **********************************************************
     // Private methods
     // **********************************************************
@@ -644,5 +654,5 @@
 	// request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
 	request.setAttribute("sessions", sessions);
     }
-    
+
 }
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
diff -u -r3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.tomcat.util.json.JSONException;
+
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -249,7 +249,7 @@
      * @throws IOException 
      * @throws JSONException 
      */
-    void setScratchingFinished(Long toolSessionId) throws JSONException, IOException;
+    void setScratchingFinished(Long toolSessionId) throws IOException;
 
     /**
      * If success return next activity's url, otherwise return null.
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -46,9 +46,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
@@ -106,6 +103,9 @@
 import org.lamsfoundation.lams.util.NumberUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Andrey Balan
  */
@@ -227,7 +227,7 @@
     public void saveOrUpdateScratchieConfigItem(ScratchieConfigItem item) {
 	scratchieConfigItemDao.saveOrUpdate(item);
     }
-    
+
     @Override
     public String[] getPresetMarks(Scratchie scratchie) {
 	String presetMarks = "";
@@ -263,7 +263,7 @@
     public void deleteScratchieItem(Long uid) {
 	scratchieItemDao.removeObject(ScratchieItem.class, uid);
     }
-    
+
     @Override
     public void populateItemsWithConfidenceLevels(Long userId, Long toolSessionId, Integer confidenceLevelsActivityUiid,
 	    Collection<ScratchieItem> items) {
@@ -362,7 +362,7 @@
 	    notebookEntry = getEntry(toolSessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
 		    ScratchieConstants.TOOL_SIGNATURE, groupLeader.getUserId().intValue());
 	}
-	
+
 	// return whether it's waiting for the leader to submit notebook
 	return isReflectOnActivity && (notebookEntry == null);
     }
@@ -583,7 +583,7 @@
     }
 
     @Override
-    public void setScratchingFinished(Long toolSessionId) throws JSONException, IOException {
+    public void setScratchingFinished(Long toolSessionId) throws IOException {
 	ScratchieSession session = this.getScratchieSessionBySessionId(toolSessionId);
 	session.setScratchingFinished(true);
 	scratchieSessionDao.saveObject(session);
@@ -918,15 +918,15 @@
 		    burningQuestionDtosOfSpecifiedItem.add(burningQuestionDto);
 		}
 	    }
-	    
+
 	    //skip empty items if required
 	    if (!burningQuestionDtosOfSpecifiedItem.isEmpty() || includeEmptyItems) {
-		BurningQuestionItemDTO burningQuestionItemDto = new BurningQuestionItemDTO();
-		burningQuestionItemDto.setScratchieItem(item);
-		burningQuestionItemDto.setBurningQuestionDtos(burningQuestionDtosOfSpecifiedItem);
-		burningQuestionItemDtos.add(burningQuestionItemDto);
-	    }
+	    BurningQuestionItemDTO burningQuestionItemDto = new BurningQuestionItemDTO();
+	    burningQuestionItemDto.setScratchieItem(item);
+	    burningQuestionItemDto.setBurningQuestionDtos(burningQuestionDtosOfSpecifiedItem);
+	    burningQuestionItemDtos.add(burningQuestionItemDto);
 	}
+	}
 
 	// handle general burning question
 	BurningQuestionItemDTO generalBurningQuestionItemDto = new BurningQuestionItemDTO();
@@ -946,7 +946,7 @@
 	generalBurningQuestionItemDto.setBurningQuestionDtos(burningQuestionDtosOfSpecifiedItem);
 	//skip empty item if required
 	if (!burningQuestionDtosOfSpecifiedItem.isEmpty() || includeEmptyItems) {
-	    burningQuestionItemDtos.add(generalBurningQuestionItemDto);
+	burningQuestionItemDtos.add(generalBurningQuestionItemDto);
 	}
 
 	//escape for Javascript
@@ -2101,7 +2101,7 @@
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -2213,14 +2213,13 @@
 
     /**
      * Rest call to create a new Scratchie content. Required fields in toolContentJSON: "title", "instructions",
-     * "questions". The questions entry should be JSONArray containing JSON objects, which in turn must contain
-     * "questionText", "displayOrder" (Integer) and a JSONArray "answers". The answers entry should be JSONArray
+     * "questions". The questions entry should be ArrayNode containing JSON objects, which in turn must contain
+     * "questionText", "displayOrder" (Integer) and a ArrayNode "answers". The answers entry should be ArrayNode
      * containing JSON objects, which in turn must contain "answerText", "displayOrder" (Integer), "correct" (Boolean).
      */
     @SuppressWarnings("unchecked")
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Scratchie scratchie = new Scratchie();
 	Date updateDate = new Date();
@@ -2230,43 +2229,44 @@
 	scratchie.setDefineLater(false);
 
 	scratchie.setContentId(toolContentID);
-	scratchie.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	scratchie.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	scratchie.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	scratchie.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 
-	scratchie.setBurningQuestionsEnabled(JsonUtil.opt(toolContentJSON, "burningQuestionsEnabled", false));
-	scratchie.setTimeLimit(JsonUtil.opt(toolContentJSON, "timeLimit", 0));
-	scratchie.setExtraPoint(JsonUtil.opt(toolContentJSON, "extraPoint", false));
-	scratchie.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	scratchie.setReflectInstructions(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
+	scratchie.setBurningQuestionsEnabled(JsonUtil.optBoolean(toolContentJSON, "burningQuestionsEnabled", false));
+	scratchie.setTimeLimit(JsonUtil.optInt(toolContentJSON, "timeLimit", 0));
+	scratchie.setExtraPoint(JsonUtil.optBoolean(toolContentJSON, "extraPoint", false));
+	scratchie.setReflectOnActivity(
+		JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	scratchie.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
 
 	// Scratchie Items
 	Set<ScratchieItem> newItems = new LinkedHashSet<>();
 
-	JSONArray questions = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
-	for (int i = 0; i < questions.length(); i++) {
-	    JSONObject questionData = (JSONObject) questions.get(i);
+	ArrayNode questions = JsonUtil.optArray(toolContentJSON, RestTags.QUESTIONS);
+	for (int i = 0; i < questions.size(); i++) {
+	    ObjectNode questionData = (ObjectNode) questions.get(i);
 
 	    ScratchieItem item = new ScratchieItem();
 	    item.setCreateDate(updateDate);
 	    item.setCreateByAuthor(true);
-	    item.setOrderId(questionData.getInt(RestTags.DISPLAY_ORDER));
-	    item.setTitle(questionData.getString(RestTags.QUESTION_TITLE));
-	    item.setDescription(questionData.getString(RestTags.QUESTION_TEXT));
+	    item.setOrderId(JsonUtil.optInt(questionData, RestTags.DISPLAY_ORDER));
+	    item.setTitle(JsonUtil.optString(questionData, RestTags.QUESTION_TITLE));
+	    item.setDescription(JsonUtil.optString(questionData, RestTags.QUESTION_TEXT));
 	    newItems.add(item);
 
 	    // set options
 	    Set<ScratchieAnswer> newAnswers = new LinkedHashSet<>();
 
-	    JSONArray answersData = questionData.getJSONArray(RestTags.ANSWERS);
-	    for (int j = 0; j < answersData.length(); j++) {
-		JSONObject answerData = (JSONObject) answersData.get(j);
+	    ArrayNode answersData = JsonUtil.optArray(questionData, RestTags.ANSWERS);
+	    for (int j = 0; j < answersData.size(); j++) {
+		ObjectNode answerData = (ObjectNode) answersData.get(j);
 		ScratchieAnswer answer = new ScratchieAnswer();
 		// Removes redundant new line characters from options left by CKEditor (otherwise it will break
 		// Javascript in monitor). Copied from AuthoringAction.
-		String answerDescription = answerData.getString(RestTags.ANSWER_TEXT);
+		String answerDescription = JsonUtil.optString(answerData, RestTags.ANSWER_TEXT);
 		answer.setDescription(answerDescription != null ? answerDescription.replaceAll("[\n\r\f]", "") : "");
-		answer.setCorrect(answerData.getBoolean(RestTags.CORRECT));
-		answer.setOrderId(answerData.getInt(RestTags.DISPLAY_ORDER));
+		answer.setCorrect(JsonUtil.optBoolean(answerData, RestTags.CORRECT));
+		answer.setOrderId(JsonUtil.optInt(answerData, RestTags.DISPLAY_ORDER));
 		answer.setScratchieItem(item);
 		newAnswers.add(answer);
 	    }
@@ -2277,7 +2277,5 @@
 
 	scratchie.setScratchieItems(newItems);
 	saveOrUpdateScratchie(scratchie);
-
     }
-
-}
+}
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -48,8 +48,8 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionRedirect;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
+
+
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -78,6 +78,9 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Andrey Balan
  */
@@ -90,7 +93,7 @@
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response)
-	    throws IOException, ServletException, JSONException, ScratchieApplicationException, SchedulerException {
+	    throws IOException, ServletException, ScratchieApplicationException, SchedulerException {
 
 	String param = mapping.getParameter();
 	// -----------------------Scratchie Learner function ---------------------------
@@ -262,7 +265,7 @@
 	if (mode.isTeacher()) {
 	    service.getScratchesOrder(items, toolSessionId);
 	}
-	
+
 	//display confidence levels 
 	if (scratchie.isConfidenceLevelsEnabled()) {
 	    service.populateItemsWithConfidenceLevels(user.getUserId(), toolSessionId, scratchie.getConfidenceLevelsActivityUiid(), items);
@@ -309,22 +312,22 @@
 	boolean isWaitingForLeaderToSubmitNotebook = isReflectOnActivity && (notebookEntry == null);
 	boolean isShowResults = (isScratchingFinished && !isWaitingForLeaderToSubmitNotebook) && !mode.isTeacher();
 
-	// show notebook page to the leader
+	    // show notebook page to the leader
 	if (isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitNotebook) {
 	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("newReflection"));
 	    redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    redirect.addParameter(AttributeNames.ATTR_MODE, mode);
 	    return redirect;
 
-	// show results page
+	    // show results page
 	} else if (isShowResults) {
 
 	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("showResults"));
 	    redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    redirect.addParameter(AttributeNames.ATTR_MODE, mode);
 	    return redirect;
 
-	// show learning.jsp page
+	    // show learning.jsp page
 	} else {
 
 	    // time limit feature
@@ -381,7 +384,7 @@
      * Record in DB that leader has scratched specified answer. And return whether scratchie answer is correct or not.
      */
     private ActionForward recordItemScratched(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws JSONException, IOException, ScratchieApplicationException {
+	    HttpServletResponse response) throws IOException, ScratchieApplicationException {
 	initializeScratchieService();
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -409,10 +412,10 @@
 	    return null;
 	}
 
-	JSONObject JSONObject = new JSONObject();
-	JSONObject.put(ScratchieConstants.ATTR_ANSWER_CORRECT, answer.isCorrect());
+	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
+	ObjectNode.put(ScratchieConstants.ATTR_ANSWER_CORRECT, answer.isCorrect());
 	response.setContentType("application/x-json;charset=utf-8");
-	response.getWriter().print(JSONObject);
+	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)
@@ -454,7 +457,7 @@
      * Displays results page. When leader gets to this page, scratchingFinished column is set to true for all users.
      */
     private ActionForward showResults(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ScratchieApplicationException, JSONException, IOException {
+	    HttpServletResponse response) throws ScratchieApplicationException, IOException {
 	initializeScratchieService();
 	// get back SessionMap
 	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
@@ -469,7 +472,7 @@
 	ScratchieSession toolSession = service.getScratchieSessionBySessionId(toolSessionId);
 	Scratchie scratchie = toolSession.getScratchie();
 	Long userUid = (Long) sessionMap.get(ScratchieConstants.ATTR_USER_UID);
-	
+
 	//handle burning questions saving if needed
 	if (toolSession.isUserGroupLeader(userUid) && scratchie.isBurningQuestionsEnabled() && !toolSession.isScratchingFinished()) {
 	    saveBurningQuestions(request);
@@ -517,7 +520,7 @@
 
 	return mapping.findForward(ScratchieConstants.SUCCESS);
     }
-    
+
     /**
      * Saves newly entered burning question. Used by jqGrid cellediting feature.
      */
@@ -540,7 +543,7 @@
 
     private ActionForward like(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response)
-	    throws JSONException, IOException, ServletException, ScratchieApplicationException {
+	    throws IOException, ServletException, ScratchieApplicationException {
 	initializeScratchieService();
 
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
@@ -559,16 +562,16 @@
 
 	boolean added = service.addLike(burningQuestionUid, sessionId);
 
-	JSONObject JSONObject = new JSONObject();
-	JSONObject.put("added", added);
+	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
+	ObjectNode.put("added", added);
 	response.setContentType("application/json;charset=utf-8");
-	response.getWriter().print(JSONObject);
+	response.getWriter().print(ObjectNode);
 	return null;
     }
 
     private ActionForward removeLike(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response)
-	    throws JSONException, IOException, ServletException, ScratchieApplicationException {
+	    throws IOException, ServletException, ScratchieApplicationException {
 	initializeScratchieService();
 
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
@@ -587,10 +590,10 @@
 
 	service.removeLike(burningQuestionUid, sessionId);
 
-	JSONObject JSONObject = new JSONObject();
-	JSONObject.put("added", true);
+	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
+	ObjectNode.put("added", true);
 	response.setContentType("application/json;charset=utf-8");
-	response.getWriter().print(JSONObject);
+	response.getWriter().print(ObjectNode);
 	return null;
     }
 
@@ -631,19 +634,19 @@
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(sessionMapID);
 	final Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);	
-	
+
 	// only leader is allowed to submit burning questions
 	ScratchieUser leader = getCurrentUser(sessionId);
 	ScratchieSession toolSession = service.getScratchieSessionBySessionId(sessionId);
 	if (!toolSession.isUserGroupLeader(leader.getUid())) {
 	    return null;
 	}
-	
+
 	saveBurningQuestions(request);
 
 	return null;
     }
-    
+
     /**
      * Saves burning questions entered by user. It also updates its values in SessionMap.
      */
@@ -672,13 +675,13 @@
 	service.saveBurningQuestion(sessionId, null, generalQuestion);
 	// update general question in sessionMap
 	sessionMap.put(ScratchieConstants.ATTR_GENERAL_BURNING_QUESTION, generalQuestion);
-    }
+	}
 
     /**
      * Display empty reflection form.
      */
     private ActionForward newReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws ScratchieApplicationException, JSONException, IOException {
+	    HttpServletResponse response) throws ScratchieApplicationException, IOException {
 
 	initializeScratchieService();
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
@@ -704,7 +707,7 @@
 
 	ScratchieSession toolSession = service.getScratchieSessionBySessionId(toolSessionId);
 	Scratchie scratchie = toolSession.getScratchie();
-	
+
 	//handle burning questions saving if needed
 	if (toolSession.isUserGroupLeader(userUid) && scratchie.isBurningQuestionsEnabled() && !toolSession.isScratchingFinished()) {
 	    saveBurningQuestions(request);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
===================================================================
diff -u -r868cbadb5ccd51c7172a97cfd02b31edbaa9d97a -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 868cbadb5ccd51c7172a97cfd02b31edbaa9d97a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -20,8 +20,6 @@
 import javax.websocket.server.ServerEndpoint;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
@@ -31,6 +29,9 @@
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * Sends Scratchies actions to non-leaders.
  *
@@ -138,8 +139,8 @@
 	 * Feeds websockets with scratched answers.
 	 */
 	@SuppressWarnings("unchecked")
-	private static void send(Long toolSessionId) throws JSONException, IOException {
-	    JSONObject responseJSON = new JSONObject();
+	private static void send(Long toolSessionId) throws IOException {
+	    ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 
 	    Collection<ScratchieItem> items = LearningWebsocketServer.getScratchieService()
 		    .getItemsWithIndicatedScratches(toolSessionId);
@@ -148,7 +149,7 @@
 		Long itemUid = item.getUid();
 		// do not init variables below until it's really needed
 		Map<Long, Boolean> itemCache = null;
-		JSONObject itemJSON = null;
+		ObjectNode itemJSON = null;
 		for (ScratchieAnswer answer : (Set<ScratchieAnswer>) item.getAnswers()) {
 		    if (answer.isScratched()) {
 			// answer is scratched, check if it is present in cache
@@ -168,19 +169,19 @@
 			    // send only updates, nothing Learners are already aware of
 			    itemCache.put(answerUid, answerStoredIsCorrect);
 			    if (itemJSON == null) {
-				itemJSON = new JSONObject();
+				itemJSON = JsonNodeFactory.instance.objectNode();
 			    }
 			    itemJSON.put(answerUid.toString(), answerStoredIsCorrect);
 			}
 		    }
 		}
 		if (itemJSON != null) {
-		    responseJSON.put(itemUid.toString(), itemJSON);
+		    responseJSON.set(itemUid.toString(), itemJSON);
 		}
 	    }
 
 	    // are there any updates to send?
-	    if (responseJSON.length() == 0) {
+	    if (responseJSON.size() == 0) {
 		return;
 	    }
 
@@ -210,7 +211,7 @@
      * Registeres the Learner for processing by SendWorker.
      */
     @OnOpen
-    public void registerUser(Session websocket) throws JSONException, IOException {
+    public void registerUser(Session websocket) throws IOException {
 	Long toolSessionId = Long
 		.valueOf(websocket.getRequestParameterMap().get(AttributeNames.PARAM_TOOL_SESSION_ID).get(0));
 	Set<Session> sessionWebsockets = LearningWebsocketServer.websockets.get(toolSessionId);
@@ -254,13 +255,13 @@
      * The leader finished scratching and also . Non-leaders will have
      * Finish button displayed.
      */
-    public static void sendCloseRequest(Long toolSessionId) throws JSONException, IOException {
+    public static void sendCloseRequest(Long toolSessionId) throws IOException {
 	Set<Session> sessionWebsockets = LearningWebsocketServer.websockets.get(toolSessionId);
 	if (sessionWebsockets == null) {
 	    return;
 	}
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("close", true);
 	String response = responseJSON.toString();
 
@@ -275,13 +276,13 @@
      * The time limit is expired but leader hasn't submitted required notebook/burning questions yet. Non-leaders
      * will need to refresh the page in order to stop showing them questions page.
      */
-    public static void sendPageRefreshRequest(Long toolSessionId) throws JSONException, IOException {
+    public static void sendPageRefreshRequest(Long toolSessionId) throws IOException {
 	Set<Session> sessionWebsockets = LearningWebsocketServer.websockets.get(toolSessionId);
 	if (sessionWebsockets == null) {
 	    return;
 	}
 
-	JSONObject responseJSON = new JSONObject();
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
 	responseJSON.put("pageRefresh", true);
 	String response = responseJSON.toString();
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
diff -u -r3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.scratchie.web.action;
 
 import java.io.IOException;
@@ -45,8 +44,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary;
@@ -62,21 +59,25 @@
 import org.lamsfoundation.lams.util.ExcelCell;
 import org.lamsfoundation.lams.util.ExcelUtil;
 import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 public class MonitoringAction extends Action {
     public static Logger log = Logger.getLogger(MonitoringAction.class);
 
     private static IScratchieService service;
 
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, JSONException {
+	    HttpServletResponse response) throws IOException, ServletException {
 	String param = mapping.getParameter();
 
 	request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
@@ -111,7 +112,7 @@
 
 	initializeScratchieService();
 	// initialize Session Map
-	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
@@ -129,7 +130,8 @@
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
 	    request.setAttribute(ScratchieConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
-	    request.setAttribute(ScratchieConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()));
+	    request.setAttribute(ScratchieConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING,
+		    DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()));
 	}
 
 	// cache into sessionMap
@@ -215,7 +217,7 @@
      * @param request
      * @param response
      * @return
-     * @throws IOException 
+     * @throws IOException
      */
     private ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
@@ -245,7 +247,7 @@
 
     /**
      * Exports tool results into excel.
-     * 
+     *
      * @throws IOException
      */
     private ActionForward exportExcel(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -282,7 +284,7 @@
      * Get the mark summary with data arranged in bands. Can be displayed graphically or in a table.
      */
     private ActionForward getMarkChartData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	    HttpServletResponse res) throws IOException, ServletException {
 
 	initializeScratchieService();
 	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
@@ -292,17 +294,18 @@
 
 	Scratchie scratchie = (Scratchie) sessionMap.get(ScratchieConstants.ATTR_SCRATCHIE);
 	List<Number> results = null;
-	
-	if ( scratchie != null ) {
+
+	if (scratchie != null) {
 	    results = service.getMarksArray(scratchie.getContentId());
 	}
-	
-	JSONObject responseJSON = new JSONObject();
-	if ( results != null )
-	    responseJSON.put("data", results);
-	else 
-	    responseJSON.put("data", new Float[0]);
 
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	if (results != null) {
+	    responseJSON.set("data", JsonUtil.readArray(results));
+	} else {
+	    responseJSON.set("data", JsonUtil.readArray(new Float[0]));
+	}
+
 	res.setContentType("application/json;charset=utf-8");
 	res.getWriter().write(responseJSON.toString());
 	return null;
@@ -319,7 +322,7 @@
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
 	Scratchie scratchie = (Scratchie) sessionMap.get(ScratchieConstants.ATTR_SCRATCHIE);
-	if ( scratchie != null ) {
+	if (scratchie != null) {
 	    LeaderResultsDTO leaderDto = service.getLeaderResultsDTOForLeaders(scratchie.getContentId());
 	    sessionMap.put("leaderDto", leaderDto);
 	}
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.scribe.service;
 
 import java.util.ArrayList;
@@ -34,9 +33,6 @@
 import java.util.TreeMap;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -72,6 +68,10 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.JsonUtil;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * An implementation of the IScribeService interface.
  *
@@ -149,19 +149,19 @@
 
     @Override
     public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
-	return new TreeMap<String, ToolOutput>();
+	return new TreeMap<>();
     }
 
     @Override
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return null;
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -332,7 +332,7 @@
     @Override
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
 	    throws ToolException {
-	return new TreeMap<String, ToolOutputDefinition>();
+	return new TreeMap<>();
     }
 
     @Override
@@ -495,15 +495,15 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public void submitReport(Long toolSessionId, String userName, JSONObject requestJSON) throws JSONException {
+    public void submitReport(Long toolSessionId, String userName, ObjectNode requestJSON) {
 	ScribeSession scribeSession = getSessionBySessionId(toolSessionId);
 	ScribeUser scribe = scribeSession.getAppointedScribe();
 	if ((scribe == null) || !scribe.getLoginName().equals(userName)) {
@@ -515,11 +515,10 @@
 	    saveOrUpdateScribeUser(learner);
 	}
 
-	JSONArray reportsJSON = requestJSON.getJSONArray("reports");
-	for (int reportIndex = 0; reportIndex < reportsJSON.length(); reportIndex++) {
-	    JSONObject reportJSON = reportsJSON.getJSONObject(reportIndex);
-	    Long uid = reportJSON.getLong("uid");
-	    String text = reportJSON.getString("text");
+	ArrayNode reportsJSON = JsonUtil.optArray(requestJSON, "reports");
+	for (JsonNode reportJSON : reportsJSON) {
+	    Long uid = JsonUtil.optLong(reportJSON, "uid");
+	    String text = JsonUtil.optString(reportJSON, "text");
 	    for (ScribeReportEntry report : (Set<ScribeReportEntry>) scribeSession.getScribeReportEntries()) {
 		if (report.getUid().equals(uid)) {
 		    report.setEntryText(text);
@@ -640,17 +639,16 @@
 	return new ToolCompletionStatus(learner.isFinishedActivity() ? ToolCompletionStatus.ACTIVITY_COMPLETED
 		: ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null);
     }
-    
+
     // ****************** REST methods *************************
 
     /**
      * Used by the Rest calls to create content. Mandatory fields in toolContentJSON: "title", "instructions",
-     * "questions". Questions must contain a JSONArray of JSONObject objects, which have the following mandatory fields:
+     * "questions". Questions must contain a ArrayNode of ObjectNode objects, which have the following mandatory fields:
      * "displayOrder", "questionText" There must be at least one topic object in the "questions" array.
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Date updateDate = new Date();
 
@@ -663,25 +661,24 @@
 	scribe.setContentInUse(false);
 	scribe.setDefineLater(false);
 
-	scribe.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	scribe.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	scribe.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	scribe.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 
-	scribe.setAutoSelectScribe(JsonUtil.opt(toolContentJSON, "autoSelectScribe", Boolean.FALSE));
-	scribe.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	scribe.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
-	scribe.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	scribe.setShowAggregatedReports(JsonUtil.opt(toolContentJSON, "showAggregatedReports", Boolean.FALSE));
+	scribe.setAutoSelectScribe(JsonUtil.optBoolean(toolContentJSON, "autoSelectScribe", Boolean.FALSE));
+	scribe.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	scribe.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	scribe.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	scribe.setShowAggregatedReports(JsonUtil.optBoolean(toolContentJSON, "showAggregatedReports", Boolean.FALSE));
 
 	if (scribe.getScribeHeadings() == null) {
 	    scribe.setScribeHeadings(new HashSet());
 	}
 
-	JSONArray topics = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
-	for (int i = 0; i < topics.length(); i++) {
-	    JSONObject topic = topics.getJSONObject(i);
+	ArrayNode topics = JsonUtil.optArray(toolContentJSON, RestTags.QUESTIONS);
+	for (JsonNode topic : topics) {
 	    ScribeHeading heading = new ScribeHeading();
-	    heading.setDisplayOrder(topic.getInt(RestTags.DISPLAY_ORDER));
-	    heading.setHeadingText(topic.getString(RestTags.QUESTION_TEXT));
+	    heading.setDisplayOrder(JsonUtil.optInt(topic, RestTags.DISPLAY_ORDER));
+	    heading.setHeadingText(JsonUtil.optString(topic, RestTags.QUESTION_TEXT));
 	    heading.setScribe(scribe);
 	    scribe.getScribeHeadings().add(heading);
 	}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -38,9 +38,6 @@
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -87,6 +84,9 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Dapeng.Ni
  */
@@ -226,13 +226,13 @@
 
     @Override
     public Map<Long, Set<ReflectDTO>> getReflectList(Long contentId, boolean setEntry) {
-	Map<Long, Set<ReflectDTO>> map = new HashMap<Long, Set<ReflectDTO>>();
+	Map<Long, Set<ReflectDTO>> map = new HashMap<>();
 
 	List<SurveySession> sessionList = surveySessionDao.getByContentId(contentId);
 	for (SurveySession session : sessionList) {
 	    Long sessionId = session.getSessionId();
 	    boolean hasRefection = session.getSurvey().isReflectOnActivity();
-	    Set<ReflectDTO> list = new TreeSet<ReflectDTO>(new ReflectDTOComparator());
+	    Set<ReflectDTO> list = new TreeSet<>(new ReflectDTOComparator());
 	    // get all users in this session
 	    List<SurveyUser> users = surveyUserDao.getBySessionID(sessionId);
 	    for (SurveyUser user : users) {
@@ -302,17 +302,17 @@
 
     @Override
     public List<AnswerDTO> getQuestionAnswers(Long sessionId, Long userUid) {
-	List<SurveyQuestion> questions = new ArrayList<SurveyQuestion>();
+	List<SurveyQuestion> questions = new ArrayList<>();
 	SurveySession session = surveySessionDao.getSessionBySessionId(sessionId);
 	if (session != null) {
 	    Survey survey = session.getSurvey();
 	    if (survey != null) {
-		questions = new ArrayList<SurveyQuestion>(survey.getQuestions());
+		questions = new ArrayList<>(survey.getQuestions());
 	    }
 	}
 
 	// set answer for this question acoording
-	List<AnswerDTO> answers = new ArrayList<AnswerDTO>();
+	List<AnswerDTO> answers = new ArrayList<>();
 	for (SurveyQuestion question : questions) {
 	    AnswerDTO answerDTO = new AnswerDTO(question);
 	    SurveyAnswer answer = surveyAnswerDao.getAnswer(question.getUid(), userUid);
@@ -352,7 +352,7 @@
 	AnswerDTO answerDto = new AnswerDTO(question);
 
 	// create a map to hold Option UID and the counts for that choice
-	Map<Long, Integer> optMap = new HashMap<Long, Integer>();
+	Map<Long, Integer> optMap = new HashMap<>();
 
 	// total number of answers - used for the percentage calculations
 	int numberAnswers = 0;
@@ -407,7 +407,7 @@
     @Override
     public SortedMap<SurveySession, List<AnswerDTO>> getSummary(Long toolContentId) {
 
-	SortedMap<SurveySession, List<AnswerDTO>> summary = new TreeMap<SurveySession, List<AnswerDTO>>(
+	SortedMap<SurveySession, List<AnswerDTO>> summary = new TreeMap<>(
 		new SurveySessionComparator());
 
 	Survey survey = surveyDao.getByContentId(toolContentId);
@@ -416,7 +416,7 @@
 	List<SurveySession> sessionList = surveySessionDao.getByContentId(toolContentId);
 	// iterator all sessions under this survey content, and get all questions and its answers.
 	for (SurveySession session : sessionList) {
-	    List<AnswerDTO> responseList = new ArrayList<AnswerDTO>();
+	    List<AnswerDTO> responseList = new ArrayList<>();
 	    for (SurveyQuestion question : questionList) {
 		AnswerDTO response = getQuestionResponse(session.getSessionId(), question.getUid());
 		responseList.add(response);
@@ -429,7 +429,7 @@
 
     @Override
     public SortedMap<SurveySession, Integer> getStatistic(Long contentId) {
-	SortedMap<SurveySession, Integer> result = new TreeMap<SurveySession, Integer>(new SurveySessionComparator());
+	SortedMap<SurveySession, Integer> result = new TreeMap<>(new SurveySessionComparator());
 
 	List<Object[]> stats = surveyUserDao.getStatisticsBySession(contentId);
 	for (Object[] stat : stats) {
@@ -452,7 +452,7 @@
 	SurveySession session = surveySessionDao.getSessionBySessionId(toolSessionID);
 	List<SurveyUser> users = surveyUserDao.getBySessionID(toolSessionID);
 
-	Map<SurveySession, List<SurveyUser>> sessionToUsersMap = new HashMap<SurveySession, List<SurveyUser>>();
+	Map<SurveySession, List<SurveyUser>> sessionToUsersMap = new HashMap<>();
 	sessionToUsersMap.put(session, users);
 
 	return getExportSummary(sessionToUsersMap);
@@ -468,11 +468,11 @@
     private SortedMap<SurveySession, SortedMap<SurveyQuestion, List<AnswerDTO>>> getExportSummary(
 	    Map<SurveySession, List<SurveyUser>> sessionToUsersMap) {
 
-	SortedMap<SurveySession, SortedMap<SurveyQuestion, List<AnswerDTO>>> summary = new TreeMap<SurveySession, SortedMap<SurveyQuestion, List<AnswerDTO>>>(
+	SortedMap<SurveySession, SortedMap<SurveyQuestion, List<AnswerDTO>>> summary = new TreeMap<>(
 		new SurveySessionComparator());
 
 	// all questions
-	List<SurveyQuestion> questions = new ArrayList<SurveyQuestion>();
+	List<SurveyQuestion> questions = new ArrayList<>();
 	if (!sessionToUsersMap.isEmpty()) {
 	    SurveySession session = sessionToUsersMap.keySet().iterator().next();
 	    Survey survey = session.getSurvey();
@@ -482,14 +482,14 @@
 	// traverse all sessions
 	for (SurveySession session : sessionToUsersMap.keySet()) {
 
-	    SortedMap<SurveyQuestion, List<AnswerDTO>> questionMap = new TreeMap<SurveyQuestion, List<AnswerDTO>>(
+	    SortedMap<SurveyQuestion, List<AnswerDTO>> questionMap = new TreeMap<>(
 		    new QuestionsComparator());
 
 	    // traverse all questions
 	    for (SurveyQuestion question : questions) {
 
 		List<SurveyUser> users = sessionToUsersMap.get(session);
-		List<AnswerDTO> answerDtos = new ArrayList<AnswerDTO>();
+		List<AnswerDTO> answerDtos = new ArrayList<>();
 
 		// if it's for a single user - query DB for only one answer for this current user
 		if (users.size() == 1) {
@@ -546,10 +546,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -852,12 +852,12 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return getSurveyOutputFactory().getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -962,7 +962,7 @@
 	return new ToolCompletionStatus(learner.isSessionFinished() ? ToolCompletionStatus.ACTIVITY_COMPLETED
 		: ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null);
     }
-    
+
     // ****************** REST methods *************************
 
     /**
@@ -972,62 +972,62 @@
      * (default true), showOnePage (default true), notifyTeachersOnAnswerSumbit (default false), showOtherUsersAnswers
      * (default false), reflectOnActivity, reflectInstructions, submissionDeadline
      *
-     * Questions must contain a JSONArray of JSONObject objects, which have the following mandatory fields:
-     * questionText, type (1=one answer,2=multiple answers,3=free text entry) and answers. Answers is a JSONArray of
+     * Questions must contain a ArrayNode of ObjectNode objects, which have the following mandatory fields:
+     * questionText, type (1=one answer,2=multiple answers,3=free text entry) and answers. Answers is a ArrayNode of
      * strings, which are the answer text. A question may also have the optional fields: allowOtherTextEntry (default
      * false), required (default true)
      *
      * There should be at least one question object in the Questions array and at least one option in the Options array.
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Survey survey = new Survey();
 	Date updateDate = new Date();
 	survey.setCreated(updateDate);
 	survey.setUpdated(updateDate);
 
 	survey.setContentId(toolContentID);
-	survey.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	survey.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	survey.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	survey.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 
 	survey.setContentInUse(false);
 	survey.setDefineLater(false);
-	survey.setLockWhenFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.TRUE));
-	survey.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
-	survey.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	survey.setLockWhenFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.TRUE));
+	survey.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	survey.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
 	survey.setNotifyTeachersOnAnswerSumbit(
-		JsonUtil.opt(toolContentJSON, "notifyTeachersOnAnswerSumbit", Boolean.FALSE));
-	survey.setShowOnePage(JsonUtil.opt(toolContentJSON, "showOnePage", Boolean.TRUE));
-	survey.setShowOtherUsersAnswers(JsonUtil.opt(toolContentJSON, "showOtherUsersAnswers", Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnAnswerSumbit", Boolean.FALSE));
+	survey.setShowOnePage(JsonUtil.optBoolean(toolContentJSON, "showOnePage", Boolean.TRUE));
+	survey.setShowOtherUsersAnswers(JsonUtil.optBoolean(toolContentJSON, "showOtherUsersAnswers", Boolean.FALSE));
 
 	// submissionDeadline is set in monitoring
 
-	SurveyUser surveyUser = new SurveyUser(userID.longValue(), toolContentJSON.getString("firstName"),
-		toolContentJSON.getString("lastName"), toolContentJSON.getString("loginName"), survey);
+	SurveyUser surveyUser = new SurveyUser(userID.longValue(), JsonUtil.optString(toolContentJSON, "firstName"),
+		JsonUtil.optString(toolContentJSON, "lastName"), JsonUtil.optString(toolContentJSON, "loginName"),
+		survey);
 	survey.setCreatedBy(surveyUser);
 
 	// **************************** Handle Survey Questions *********************
 
-	JSONArray questions = toolContentJSON.getJSONArray(RestTags.QUESTIONS);
-	for (int i = 0; i < questions.length(); i++) {
-	    JSONObject questionData = (JSONObject) questions.get(i);
+	ArrayNode questions = JsonUtil.optArray(toolContentJSON, RestTags.QUESTIONS);
+	for (int i = 0; i < questions.size(); i++) {
+	    ObjectNode questionData = (ObjectNode) questions.get(i);
 	    SurveyQuestion newQuestion = new SurveyQuestion();
 	    newQuestion.setCreateBy(surveyUser);
 	    newQuestion.setCreateDate(updateDate);
-	    newQuestion.setDescription(questionData.getString(RestTags.QUESTION_TEXT));
-	    newQuestion.setType((short) questionData.getInt("type"));
-	    newQuestion.setAppendText(JsonUtil.opt(questionData, "allowOtherTextEntry", Boolean.FALSE));
-	    Boolean required = JsonUtil.opt(questionData, "required", Boolean.TRUE);
+	    newQuestion.setDescription(JsonUtil.optString(questionData, RestTags.QUESTION_TEXT));
+	    newQuestion.setType((short) questionData.get("type").asInt());
+	    newQuestion.setAppendText(JsonUtil.optBoolean(questionData, "allowOtherTextEntry", Boolean.FALSE));
+	    Boolean required = JsonUtil.optBoolean(questionData, "required", Boolean.TRUE);
 	    newQuestion.setOptional(!required);
 	    newQuestion.setSequenceId(i + 1); // sequence number starts at 1
 
-	    Set<SurveyOption> newOptions = new HashSet<SurveyOption>();
-	    JSONArray options = questionData.getJSONArray(RestTags.ANSWERS);
-	    for (int j = 0; j < options.length(); j++) {
+	    Set<SurveyOption> newOptions = new HashSet<>();
+	    ArrayNode options = JsonUtil.optArray(questionData, RestTags.ANSWERS);
+	    for (int j = 0; j < options.size(); j++) {
 		SurveyOption newOption = new SurveyOption();
-		newOption.setDescription(options.getString(j));
+		newOption.setDescription(options.get(j).asText());
 		newOption.setSequenceId(j); // sequence number starts at 0
 		newOptions.add(newOption);
 	    }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java	(.../VoteService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java	(.../VoteService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -43,9 +43,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -105,6 +102,9 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.dao.DataAccessException;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * The POJO implementation of Voting service. All business logic of Voting tool is implemented in this class. It
  * translates the request from presentation layer and performs appropriate database operation.
@@ -271,7 +271,7 @@
 	Map<Long, String> mapStandardNominationsContent = new TreeMap<Long, String>(new VoteComparator());
 	Map<Long, Double> mapVoteRates = new TreeMap<Long, Double>(new VoteComparator());
 
-	for (VoteQueContent question : (Set<VoteQueContent>) voteContent.getVoteQueContents()) {
+	for (VoteQueContent question : voteContent.getVoteQueContents()) {
 
 	    mapStandardNominationsHTMLedContent.put(mapIndex, question.getQuestion());
 	    String noHTMLNomination = VoteUtils.stripHTML(question.getQuestion());
@@ -327,7 +327,7 @@
 	LinkedList<SessionDTO> sessionDTOs = new LinkedList<SessionDTO>();
 
 	VoteContent voteContent = this.getVoteContent(toolContentID);
-	for (VoteSession session : (Set<VoteSession>) voteContent.getVoteSessions()) {
+	for (VoteSession session : voteContent.getVoteSessions()) {
 
 	    SessionDTO sessionDTO = new SessionDTO();
 	    sessionDTO.setSessionId(session.getVoteSessionId().toString());
@@ -344,7 +344,7 @@
 	    Map<Long, Long> mapStandardQuestionUid = new TreeMap<Long, Long>(new VoteComparator());
 	    Map<Long, Long> mapStandardToolSessionUid = new TreeMap<Long, Long>(new VoteComparator());
 
-	    for (VoteQueContent question : (Set<VoteQueContent>) voteContent.getVoteQueContents()) {
+	    for (VoteQueContent question : voteContent.getVoteQueContents()) {
 		mapStandardNominationsHTMLedContent.put(mapIndex, question.getQuestion());
 
 		int votesCount = voteUsrAttemptDAO.getStandardAttemptsForQuestionContentAndSessionUid(question.getUid(),
@@ -407,10 +407,11 @@
 		totalCompletedSessionUserCount += sessionDTO.getCompletedSessionUserCount();
 
 		Long mapIndex = 1L;
-		for (VoteQueContent question : (Set<VoteQueContent>) voteContent.getVoteQueContents()) {
+		for (VoteQueContent question : voteContent.getVoteQueContents()) {
 		    Long votesCount = sessionDTO.getMapStandardUserCount().get(mapIndex);
 		    Long oldTotalVotesCount = (totalMapStandardUserCount.get(mapIndex) != null)
-			    ? totalMapStandardUserCount.get(mapIndex) : 0L;
+			    ? totalMapStandardUserCount.get(mapIndex)
+			    : 0L;
 		    totalMapStandardUserCount.put(mapIndex, oldTotalVotesCount + votesCount);
 
 		    allSessionsVotesCount += votesCount;
@@ -423,7 +424,8 @@
 		if (voteContent.isAllowText()) {
 		    Long votesCount = sessionDTO.getMapStandardUserCount().get(mapIndex);
 		    Long oldTotalVotesCount = (totalMapStandardUserCount.get(mapIndex) != null)
-			    ? totalMapStandardUserCount.get(mapIndex) : 0L;
+			    ? totalMapStandardUserCount.get(mapIndex)
+			    : 0L;
 		    totalMapStandardUserCount.put(mapIndex, oldTotalVotesCount + votesCount);
 
 		    allSessionsVotesCount += votesCount;
@@ -446,7 +448,7 @@
 	    Long mapIndex = 1L;
 	    Map<Long, Double> totalMapVoteRates = new TreeMap<Long, Double>(new VoteComparator());
 	    int totalStandardVotesCount = 0;
-	    for (VoteQueContent question : (Set<VoteQueContent>) voteContent.getVoteQueContents()) {
+	    for (VoteQueContent question : voteContent.getVoteQueContents()) {
 
 		Long votesCount = totalMapStandardUserCount.get(mapIndex);
 
@@ -479,7 +481,7 @@
 	SortedSet<SummarySessionDTO> sessionDTOs = new TreeSet<SummarySessionDTO>();
 
 	VoteContent voteContent = this.getVoteContent(toolContentID);
-	for (VoteSession session : (Set<VoteSession>) voteContent.getVoteSessions()) {
+	for (VoteSession session : voteContent.getVoteSessions()) {
 
 	    SummarySessionDTO sessionDTO = new SummarySessionDTO();
 	    sessionDTO.setSessionName(session.getSession_name());
@@ -491,7 +493,7 @@
 
 	    int totalStandardVotesCount = 0;
 
-	    for (VoteQueContent question : (Set<VoteQueContent>) voteContent.getVoteQueContents()) {
+	    for (VoteQueContent question : voteContent.getVoteQueContents()) {
 
 		SessionNominationDTO nominationDTO = new SessionNominationDTO();
 		nominationDTO.setQuestionUid(question.getUid());
@@ -1315,7 +1317,7 @@
 	    return;
 	}
 
-	for (VoteSession session : (Set<VoteSession>) voteContent.getVoteSessions()) {
+	for (VoteSession session : voteContent.getVoteSessions()) {
 	    List<NotebookEntry> entries = coreNotebookService.getEntry(session.getVoteSessionId(),
 		    CoreNotebookConstants.NOTEBOOK_TOOL, VoteAppConstants.MY_SIGNATURE);
 	    for (NotebookEntry entry : entries) {
@@ -1339,7 +1341,7 @@
 	    return;
 	}
 
-	for (VoteSession session : (Set<VoteSession>) voteContent.getVoteSessions()) {
+	for (VoteSession session : voteContent.getVoteSessions()) {
 	    VoteQueUsr user = voteUserDAO.getVoteUserBySession(userId.longValue(), session.getUid());
 	    if (user != null) {
 		voteUsrAttemptDAO.removeAttemptsForUserandSession(user.getUid(), session.getUid());
@@ -1555,10 +1557,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -1585,7 +1587,7 @@
     @Override
     public boolean isReadOnly(Long toolContentId) {
 	VoteContent voteContent = voteContentDAO.getVoteContentByContentId(toolContentId);
-	for (VoteSession session : (Set<VoteSession>) voteContent.getVoteSessions()) {
+	for (VoteSession session : voteContent.getVoteSessions()) {
 	    if (!session.getVoteQueUsers().isEmpty()) {
 		return true;
 	    }
@@ -1608,7 +1610,7 @@
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<ToolOutput>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -1967,35 +1969,36 @@
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null);
 	}
 
-	
 	Date startDate = null;
 	Date endDate = null;
 	Set<VoteUsrAttempt> attempts = learner.getVoteUsrAttempts(); // expect only one
 	for (VoteUsrAttempt item : attempts) {
 	    Date newDate = item.getAttemptTime();
 	    if (newDate != null) {
-		if (startDate == null || newDate.before(startDate))
+		if (startDate == null || newDate.before(startDate)) {
 		    startDate = newDate;
-		if (endDate == null || newDate.after(endDate))
+		}
+		if (endDate == null || newDate.after(endDate)) {
 		    endDate = newDate;
+		}
 	    }
 	}
 
-	if (learner.isResponseFinalised())
+	if (learner.isResponseFinalised()) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate);
-	else
+	} else {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null);
+	}
     }
 
     // ****************** REST methods *************************
 
     /**
      * Rest call to create a new Vote content. Required fields in toolContentJSON: "title", "instructions", "answers".
-     * The "answers" entry should be a JSONArray of Strings.
+     * The "answers" entry should be a ArrayNode of Strings.
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 	if (logger.isDebugEnabled()) {
 	    logger.debug("Rest call to create a new Vote content for userID" + userID + " and toolContentID "
 		    + toolContentID);
@@ -2004,39 +2007,42 @@
 
 	VoteContent vote = new VoteContent();
 	vote.setVoteContentId(toolContentID);
-	vote.setTitle(toolContentJSON.getString(RestTags.TITLE));
-	vote.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
+	vote.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
+	vote.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS));
 	vote.setCreatedBy(userID);
 	vote.setCreationDate(updateDate);
 	vote.setUpdateDate(updateDate);
 
-	vote.setAllowText(JsonUtil.opt(toolContentJSON, "allowText", Boolean.FALSE));
+	vote.setAllowText(JsonUtil.optBoolean(toolContentJSON, "allowText", Boolean.FALSE));
 	vote.setDefineLater(false);
-	vote.setLockOnFinish(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
-	vote.setMaxNominationCount(JsonUtil.opt(toolContentJSON, "maxNominations", "1"));
-	vote.setMinNominationCount(JsonUtil.opt(toolContentJSON, "minNominations", "1"));
-	vote.setReflect(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	vote.setReflectionSubject(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, (String) null));
-	vote.setShowResults(JsonUtil.opt(toolContentJSON, "showResults", Boolean.TRUE));
+	vote.setLockOnFinish(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	vote.setMaxNominationCount(JsonUtil.optString(toolContentJSON, "maxNominations", "1"));
+	vote.setMinNominationCount(JsonUtil.optString(toolContentJSON, "minNominations", "1"));
+	vote.setReflect(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	vote.setReflectionSubject(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	vote.setShowResults(JsonUtil.optBoolean(toolContentJSON, "showResults", Boolean.TRUE));
 	vote.setUseSelectLeaderToolOuput(
-		JsonUtil.opt(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
+		JsonUtil.optBoolean(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE));
 
 	// Is the data flow functionality actually used anywhere?
-	vote.setAssignedDataFlowObject((Boolean) JsonUtil.opt(toolContentJSON, "assignedDataFlowObject", null));
-	vote.setExternalInputsAdded((Short) JsonUtil.opt(toolContentJSON, "externalInputsAdded", null));
-	vote.setMaxExternalInputs(JsonUtil.opt(toolContentJSON, "maxInputs", Short.valueOf("0")));
+	vote.setAssignedDataFlowObject(JsonUtil.optBoolean(toolContentJSON, "assignedDataFlowObject"));
+	Integer externalInputsAdded = JsonUtil.optInt(toolContentJSON, "externalInputsAdded");
+	if (externalInputsAdded != null) {
+	    vote.setExternalInputsAdded(externalInputsAdded.shortValue());
+	}
+	vote.setMaxExternalInputs(JsonUtil.optInt(toolContentJSON, "maxInputs", 0).shortValue());
 
 	// submissionDeadline is set in monitoring
 
 	// **************************** Nomination entries *********************
-	JSONArray answers = toolContentJSON.getJSONArray(RestTags.ANSWERS);
+	ArrayNode answers = JsonUtil.optArray(toolContentJSON, RestTags.ANSWERS);
 	//Set newAnswersSet = vote.getVoteQueContents();
-	for (int i = 0; i < answers.length(); i++) {
+	for (int i = 0; i < answers.size(); i++) {
 	    //  String answerJSONData = (String) answers.get(i);
 	    VoteQueContent answer = new VoteQueContent();
 	    answer.setDisplayOrder(i + 1);
 	    answer.setMcContent(vote);
-	    answer.setQuestion((String) answers.get(i));
+	    answer.setQuestion(answers.get(i).asText());
 	    answer.setVoteContent(vote);
 	    vote.getVoteQueContents().add(answer);
 	}
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r38497dfdb8de4ef8761e8dc7558d6ca657e2956c
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 38497dfdb8de4ef8761e8dc7558d6ca657e2956c)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.wiki.service;
 
 import java.util.ArrayList;
@@ -34,9 +33,6 @@
 import java.util.SortedMap;
 
 import org.apache.log4j.Logger;
-import org.apache.tomcat.util.json.JSONArray;
-import org.apache.tomcat.util.json.JSONException;
-import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.events.IEventNotificationService;
@@ -80,6 +76,9 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * An implementation of the IWikiService interface.
  *
@@ -140,7 +139,7 @@
 	session.setWiki(wiki);
 
 	// Create an empty list to copy the wiki pages into
-	Set<WikiPage> sessionWikiPages = new HashSet<WikiPage>();
+	Set<WikiPage> sessionWikiPages = new HashSet<>();
 
 	// Here we need to clone wikipages and content for tool session versions
 	//for (WikiPage childPage : wiki.getWikiPages()) {  // LDEV-2436
@@ -220,12 +219,12 @@
 	}
 	return wikiOutputFactory.getToolOutput(name, this, toolSessionId, learnerId);
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
-	return new ArrayList<ToolOutput>();
+	return new ArrayList<>();
     }
-    
+
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
 	return null;
@@ -488,7 +487,7 @@
 	Diff diff = new Diff(oldArray, currentArray);
 	List<Difference> diffOut = diff.diff();
 
-	LinkedList<String> result = new LinkedList<String>(Arrays.asList(currentArray));
+	LinkedList<String> result = new LinkedList<>(Arrays.asList(currentArray));
 
 	int resultOffset = 0;
 	for (Difference difference : diffOut) {
@@ -837,10 +836,10 @@
     public boolean isGroupedActivity(long toolContentID) {
 	return toolService.isGroupedActivity(toolContentID);
     }
-    
+
     @Override
     public void auditLogStartEditingActivityInMonitor(long toolContentID) {
-    	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
+	toolService.auditLogStartEditingActivityInMonitor(toolContentID);
     }
 
     @Override
@@ -1034,12 +1033,13 @@
 
 	// very complicated to try to work out from edit page, so not doing dates.
 
-	if (learner.isFinishedActivity())
+	if (learner.isFinishedActivity()) {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, null, null);
-	else
+	} else {
 	    return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null);
+	}
     }
-    
+
     /* ****************** REST methods **************************************************************************/
 
     /**
@@ -1050,57 +1050,59 @@
      * allowLearnerCreatePages (default True), allowLearnerInsertLinks (default True) notifyUpdates (default False),
      * minimumEdits and maximumEdits (default 0, no min/max)
      *
-     * Pages is a JSONArray of JSONObjects, where each object represents a Wiki page. The first entry in the array
+     * Pages is a ArrayNode of ObjectNodes, where each object represents a Wiki page. The first entry in the array
      * becomes the main page. Withing the wiki page object, mandatory fields are title and body. Optional field is
      * readOnly, which defaults to false (ie the user can edit the page).
      */
     @Override
-    public void createRestToolContent(Integer userID, Long toolContentID, JSONObject toolContentJSON)
-	    throws JSONException {
+    public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON) {
 
 	Wiki content = new Wiki();
 	Date updateDate = new Date();
 	content.setCreateDate(updateDate);
 	content.setUpdateDate(updateDate);
 	content.setCreateBy(userID.longValue());
 	content.setToolContentId(toolContentID);
-	content.setTitle(toolContentJSON.getString(RestTags.TITLE));
+	content.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE));
 	// No instructions are available in the current wiki implementation
 	// content.setInstructions(toolContentJSON.getString(RestTags.INSTRUCTIONS));
 
 	content.setContentInUse(false);
 	content.setDefineLater(false);
-	content.setReflectInstructions((String) JsonUtil.opt(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, null));
-	content.setReflectOnActivity(JsonUtil.opt(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
-	content.setLockOnFinished(JsonUtil.opt(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
+	content.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
+	content.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
+	content.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE));
 
-	content.setAllowLearnerAttachImages(JsonUtil.opt(toolContentJSON, "allowLearnerAttachImages", Boolean.TRUE));
-	content.setAllowLearnerCreatePages(JsonUtil.opt(toolContentJSON, "allowLearnerCreatePages", Boolean.TRUE));
-	content.setAllowLearnerInsertLinks(JsonUtil.opt(toolContentJSON, "allowLearnerInsertLinks", Boolean.TRUE));
-	content.setNotifyUpdates(JsonUtil.opt(toolContentJSON, "notifyUpdates", Boolean.FALSE));
-	content.setMinimumEdits(JsonUtil.opt(toolContentJSON, "minimumEdits", 0));
-	content.setMaximumEdits(JsonUtil.opt(toolContentJSON, "maximumEdits", 0));
+	content.setAllowLearnerAttachImages(
+		JsonUtil.optBoolean(toolContentJSON, "allowLearnerAttachImages", Boolean.TRUE));
+	content.setAllowLearnerCreatePages(
+		JsonUtil.optBoolean(toolContentJSON, "allowLearnerCreatePages", Boolean.TRUE));
+	content.setAllowLearnerInsertLinks(
+		JsonUtil.optBoolean(toolContentJSON, "allowLearnerInsertLinks", Boolean.TRUE));
+	content.setNotifyUpdates(JsonUtil.optBoolean(toolContentJSON, "notifyUpdates", Boolean.FALSE));
+	content.setMinimumEdits(JsonUtil.optInt(toolContentJSON, "minimumEdits", 0));
+	content.setMaximumEdits(JsonUtil.optInt(toolContentJSON, "maximumEdits", 0));
 
 	/* ********************** Handle pages ***************************************************** */
-	/* The first page becomes the main page, all other pages saved in the order in the JSONArray */
+	/* The first page becomes the main page, all other pages saved in the order in the ArrayNode */
 	boolean firstEntry = true;
 	content.setWikiPages(new HashSet<WikiPage>());
-	JSONArray pages = toolContentJSON.getJSONArray("pages");
-	for (int i = 0; i < pages.length(); i++) {
-	    JSONObject pageData = (JSONObject) pages.get(i);
+	ArrayNode pages = JsonUtil.optArray(toolContentJSON, "pages");
+	for (int i = 0; i < pages.size(); i++) {
+	    ObjectNode pageData = (ObjectNode) pages.get(i);
 
 	    WikiPage wikiPage = new WikiPage();
-	    Boolean isReadOnly = JsonUtil.opt(pageData, RestTags.READ_ONLY, Boolean.FALSE);
+	    Boolean isReadOnly = JsonUtil.optBoolean(pageData, RestTags.READ_ONLY, Boolean.FALSE);
 	    wikiPage.setEditable(!isReadOnly);
 	    wikiPage.setParentWiki(content);
-	    wikiPage.setTitle(pageData.getString(RestTags.TITLE));
+	    wikiPage.setTitle(JsonUtil.optString(pageData, RestTags.TITLE));
 	    wikiPage.setAddedBy(null);
 	    wikiPage.setWikiContentVersions(new HashSet<WikiPageContent>());
 	    wikiPage.setWikiSession(null);
 
 	    // Create a new wiki page content using the wiki page form
 	    WikiPageContent wikiPageContent = new WikiPageContent();
-	    wikiPageContent.setBody(pageData.getString("body"));
+	    wikiPageContent.setBody(JsonUtil.optString(pageData, "body"));
 	    wikiPageContent.setEditDate(updateDate);
 	    wikiPageContent.setEditor(null);
 	    wikiPageContent.setVersion(new Long(1));