Index: lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java
===================================================================
diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -r49ce087cd59d685761cbb7f9e4534b562a4f1e0b
--- lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	(.../NonGroupedToolSession.java)	(revision 55901923afea1cbd769d8daa05051aa050bb99b6)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	(.../NonGroupedToolSession.java)	(revision 49ce087cd59d685761cbb7f9e4534b562a4f1e0b)
@@ -29,6 +29,10 @@
 import org.lamsfoundation.lams.usermanagement.User;
 
 /**
+ * Not used at present - creates a separate ToolSession for each learner.
+ * When we have a user interface that allows the author to select the whole of the class
+ * vs an individual learner for the tool session, then it will be used.
+ * 
  * @author daveg
  */
 public class NonGroupedToolSession extends ToolSession {
@@ -44,7 +48,9 @@
     {
         super(null,toolActivity,createDateTime,toolSessionStateId,lesson);
         super.setUniqueKey(UNIQUE_KEY_PREFIX
+        				   +"_"
                            +toolActivity.getActivityId().toString()
+        				   +"_"
                            +user.getUserId().toString());
         this.user=user;
     }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java
===================================================================
diff -u -raf2133eea2be056c211a5c29d6f68a3d8595a513 -r49ce087cd59d685761cbb7f9e4534b562a4f1e0b
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision af2133eea2be056c211a5c29d6f68a3d8595a513)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	(.../ToolSession.java)	(revision 49ce087cd59d685761cbb7f9e4534b562a4f1e0b)
@@ -19,15 +19,15 @@
     
     /** Tool session type id for grouped */
     public static final int GROUPED_TYPE = 1;
-    /** Tool session type id for non-grouped */
+    /** Tool session type id for non-grouped - all learners in a separate session */
     public static final int NON_GROUPED_TYPE = 2;
     
     /** Tool session state id for started tool session */
     public static final int STARTED_STATE = 1;
     /** Tool session state id for completed tool session */
     public static final int ENDED_STATE = 2;
 
-    public static final String UNIQUE_KEY_PREFIX = "uq_";
+    public static final String UNIQUE_KEY_PREFIX = "uq";
     /** identifier field */
     private Long toolSessionId;
 
@@ -157,7 +157,7 @@
 	    else
 	        return GROUPED_TYPE;
 	}
-    public Lesson getLesson() {
+	public Lesson getLesson() {
         return lesson;
     }
     public void setLesson(Lesson lesson) {