Index: lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
===================================================================
diff -u -r205422ba51f37efbdb79970f502a536219ea9cb0 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java	(.../RatingServlet.java)	(revision 205422ba51f37efbdb79970f502a536219ea9cb0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java	(.../RatingServlet.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -74,10 +74,11 @@
 	Long ratingCriteriaId = Long.parseLong(objectId.split("-")[0]);
 	Long itemId = Long.parseLong(objectId.split("-")[1]);
 	RatingCriteria criteria = ratingService.getCriteriaByCriteriaId(ratingCriteriaId);
+	Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
 
 	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 	Integer userId = user.getUserID();
-
+	
 	// get rating value as either float or comment String
 	try {
 	    boolean doSave = true;
@@ -95,8 +96,8 @@
 		    List<Long> itemIds = new LinkedList<Long>();
 		    itemIds.add(itemId);
 		    Map<Long, Long> itemIdToRatedUsersCountMap = ratingLimitsByCriteria ? 
-			ratingService.countUsersRatedEachItemByCriteria(ratingCriteriaId, itemIds, userId) :
-			ratingService.countUsersRatedEachItem(toolCriteria.getToolContentId(), itemIds, userId);
+			ratingService.countUsersRatedEachItemByCriteria(ratingCriteriaId, toolSessionId, itemIds, userId) :
+			ratingService.countUsersRatedEachItem(toolCriteria.getToolContentId(), toolSessionId, itemIds, userId);
 
 		    Long currentRatings = itemIdToRatedUsersCountMap.get(itemId);
 		    if (currentRatings != null && maxRatingsForItem.compareTo(currentRatings) <= 0) {
@@ -115,7 +116,7 @@
 		    // can have but do not have to have comment
 		    String comment = WebUtil.readStrParam(request, "comment", true);
 		    if ( comment != null ) {
-        		    ratingService.commentItem(criteria, userId, itemId, comment);
+        		    ratingService.commentItem(criteria, toolSessionId, userId, itemId, comment);
         		    JSONObject.put("comment", StringEscapeUtils.escapeCsv(comment));
 		    }
 		} 
@@ -124,7 +125,7 @@
 		if ( floatString != null && floatString.length() > 0 ) {
 		    float rating = Float.parseFloat(request.getParameter("rate"));
 
-		    ItemRatingCriteriaDTO averageRatingDTO = ratingService.rateItem(criteria, userId, itemId, rating);
+		    ItemRatingCriteriaDTO averageRatingDTO = ratingService.rateItem(criteria, toolSessionId, userId, itemId, rating);
 
 		    NumberFormat numberFormat = NumberFormat.getInstance(Locale.US);
 		    numberFormat.setMaximumFractionDigits(1);
Index: lams_central/web/includes/javascript/rating.js
===================================================================
diff -u -r1c26c2925be758ef3f54ac2e98687f6d9db079d1 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_central/web/includes/javascript/rating.js	(.../rating.js)	(revision 1c26c2925be758ef3f54ac2e98687f6d9db079d1)
+++ lams_central/web/includes/javascript/rating.js	(.../rating.js)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -1,6 +1,6 @@
 
 //Please, set up LAMS_URL, COUNT_RATED_ITEMS, COMMENTS_MIN_WORDS_LIMIT, MAX_RATES and MIN_RATES, MAX_RATINGS_FOR_ITEM,
-//COMMENT_TEXTAREA_TIP_LABEL, WARN_COMMENTS_IS_BLANK_LABEL, WARN_MIN_NUMBER_WORDS_LABEL, ALLOW_RERATE  constants in parent document
+//COMMENT_TEXTAREA_TIP_LABEL, WARN_COMMENTS_IS_BLANK_LABEL, WARN_MIN_NUMBER_WORDS_LABEL, ALLOW_RERATE, SESSION_ID constants in parent document
 
 //constant indicating there is rting limits set up
 var HAS_RATING_LIMITS;
@@ -43,9 +43,18 @@
 	} else {
 		canRateAgain = ALLOW_RERATE;
 	}
-		
+	
+	// if SESSION_ID is not defined do not allow them to update ratings as the servlet will fail.
+	// But in monitoring we will do initializeJRating to display the ratings properly so then SESSION_ID is undefined.
+	var phpPathValue;
+	if ( typeof SESSION_ID === "undefined" || SESSION_ID === undefined )
+		phpPathValue = "";
+	else 
+		phpPathValue = LAMS_URL + "servlet/rateItem?hasRatingLimits=" + HAS_RATING_LIMITS + "&ratingLimitsByCriteria=" + ratingLimitsByCriteria 
+			+ "&maxRatingsForItem=" + maxRatingsForItem + "&toolSessionId=" + SESSION_ID;
+
 	$(".rating-stars-new").filter($(".rating-stars")).jRating({
-		phpPath : LAMS_URL + "servlet/rateItem?hasRatingLimits=" + HAS_RATING_LIMITS + "&ratingLimitsByCriteria=" + ratingLimitsByCriteria + "&maxRatingsForItem=" + maxRatingsForItem,
+		phpPath : phpPathValue,
 		rateMax : 5,
 		decimalLength : 1,
 		canRateAgain : canRateAgain,
@@ -83,40 +92,43 @@
 		if ( ! comment )
 			return false;
 
-		//add new comment
-    	$.ajax({
-    		type: "POST",
-    		url: LAMS_URL + 'servlet/rateItem',
-    		data: {
-    			idBox: commentsCriteriaId + '-' + itemId, 
-    			comment: comment,
-    			hasRatingLimits: HAS_RATING_LIMITS,
-    			ratingLimitsByCriteria: ratingLimitsByCriteria,
-    			maxRatingsForItem: maxRatingsForItem
-    		},
-    		success: function(data, textStatus) {
-    			if ( data.error ) {
-    				handleError();
-    			} else {
-	   				//add comment to HTML
-   					jQuery('<div/>', {
-   						'class': "rating-comment",
-   						html: data.comment
-   					}).appendTo('#comments-area-' + itemId);
-   					
- 	 				//hide comments textarea and button
-	   				$("#add-comment-area-" + itemId).hide();
-   			
-	   				//handle rating limits if available
-	  				if (HAS_RATING_LIMITS) {
-	   					handleRatingLimits(data.countRatedItems, itemId);
-	   				}
-	   			}
-    		},
-			onError : function(){
- 				handleError();
- 			}
-    	});
+		if ( ! ( typeof SESSION_ID === "undefined" || SESSION_ID === undefined ) ) {
+			//add new comment
+	    	$.ajax({
+	    		type: "POST",
+	    		url: LAMS_URL + 'servlet/rateItem',
+	    		data: {
+	    			idBox: commentsCriteriaId + '-' + itemId, 
+	    			comment: comment,
+	    			hasRatingLimits: HAS_RATING_LIMITS,
+	    			ratingLimitsByCriteria: ratingLimitsByCriteria,
+	    			maxRatingsForItem: maxRatingsForItem,
+	    			toolSessionId: SESSION_ID
+	    		},
+	    		success: function(data, textStatus) {
+	    			if ( data.error ) {
+	    				handleError();
+	    			} else {
+		   				//add comment to HTML
+	   					jQuery('<div/>', {
+	   						'class': "rating-comment",
+	   						html: data.comment
+	   					}).appendTo('#comments-area-' + itemId);
+	   					
+	 	 				//hide comments textarea and button
+		   				$("#add-comment-area-" + itemId).hide();
+	   			
+		   				//handle rating limits if available
+		  				if (HAS_RATING_LIMITS) {
+		   					handleRatingLimits(data.countRatedItems, itemId);
+		   				}
+		   			}
+	    		},
+				onError : function(){
+	 				handleError();
+	 			}
+	    	});
+		}
     	//apply only once
     }).removeClass("add-comment-new");
 }
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml	(.../Rating.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml	(.../Rating.hbm.xml)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -64,6 +64,8 @@
             column="rating"
         />
 
+		<property name="toolSessionId" type="java.lang.Long" column="tool_session_id" length="20" />  
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Rating.xml
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml	(.../RatingComment.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml	(.../RatingComment.hbm.xml)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -72,6 +72,8 @@
 			length="19">    
 		</property>
 
+		<property name="toolSessionId" type="java.lang.Long" column="tool_session_id" length="20" />  
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Rating.xml
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -0,0 +1,103 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+
+--     LDEV-2999 Include a rating option for viewed resources
+ALTER TABLE lams_rating ADD COLUMN tool_session_id BIGINT(20) DEFAULT NULL,
+	ADD CONSTRAINT FK_lams_rating_3  FOREIGN KEY (tool_session_id)
+  	REFERENCES lams_tool_session (tool_session_id) ON DELETE NO ACTION ON UPDATE NO ACTION;
+  
+ALTER TABLE lams_rating_comment ADD COLUMN tool_session_id BIGINT(20) DEFAULT NULL,
+	ADD CONSTRAINT FK_lams_rating_comment_3  FOREIGN KEY (tool_session_id)
+  	REFERENCES lams_tool_session (tool_session_id) ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+-- Update existing Image Gallery Ratings
+DROP TABLE IF EXISTS tmp_imagegallery_rating_sessionid;
+CREATE TEMPORARY TABLE tmp_imagegallery_rating_sessionid AS
+SELECT r.uid rating_uid, igs.session_id session_id
+FROM lams_rating r
+JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
+JOIN tl_laimag10_imagegallery ig ON rc.tool_content_id = ig.content_id
+JOIN tl_laimag10_session igs ON ig.uid = igs.imageGallery_uid 
+JOIN tl_laimag10_user igu ON r.user_id = igu.user_id AND igs.uid = igu.session_uid;
+
+UPDATE lams_rating r
+JOIN tmp_imagegallery_rating_sessionid tmp ON r.uid = tmp.rating_uid
+SET r.tool_session_id = tmp.session_id;
+
+DROP TABLE tmp_imagegallery_rating_sessionid;
+CREATE TEMPORARY TABLE tmp_imagegallery_rating_sessionid AS
+SELECT r.uid rating_uid, igs.session_id session_id
+FROM lams_rating_comment r
+JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
+JOIN tl_laimag10_imagegallery ig ON rc.tool_content_id = ig.content_id
+JOIN tl_laimag10_session igs ON ig.uid = igs.imageGallery_uid 
+JOIN tl_laimag10_user igu ON r.user_id = igu.user_id AND igs.uid = igu.session_uid;
+
+UPDATE lams_rating_comment r
+JOIN tmp_imagegallery_rating_sessionid tmp ON r.uid = tmp.rating_uid
+SET r.tool_session_id = tmp.session_id;
+
+-- Update existing Peer Review
+DROP TABLE IF EXISTS tmp_peerreview_rating_sessionid;
+CREATE TEMPORARY TABLE tmp_peerreview_rating_sessionid AS
+SELECT r.uid rating_uid, prs.session_id session_id
+FROM lams_rating r
+JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
+JOIN tl_laprev11_peerreview pr ON rc.tool_content_id = pr.content_id
+JOIN tl_laprev11_session prs ON pr.uid = prs.peerreview_uid
+JOIN tl_laprev11_user pru ON r.user_id = pru.user_id AND prs.uid = pru.session_uid;
+
+UPDATE lams_rating r
+JOIN tmp_peerreview_rating_sessionid tmp ON r.uid = tmp.rating_uid
+SET r.tool_session_id = tmp.session_id;
+
+DROP TABLE tmp_peerreview_rating_sessionid;
+CREATE TEMPORARY TABLE tmp_peerreview_rating_sessionid AS
+SELECT r.uid rating_uid, prs.session_id session_id
+FROM lams_rating_comment r
+JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
+JOIN tl_laprev11_peerreview pr ON rc.tool_content_id = pr.content_id
+JOIN tl_laprev11_session prs ON pr.uid = prs.peerreview_uid
+JOIN tl_laprev11_user pru ON r.user_id = pru.user_id AND prs.uid = pru.session_uid;
+
+UPDATE lams_rating_comment r
+JOIN tmp_peerreview_rating_sessionid tmp ON r.uid = tmp.rating_uid
+SET r.tool_session_id = tmp.session_id;
+
+DROP TABLE tmp_peerreview_rating_sessionid;
+
+-- Update existing QA
+DROP TABLE IF EXISTS tmp_qa_rating_sessionid;
+CREATE TEMPORARY TABLE tmp_qa_rating_sessionid AS
+SELECT r.uid rating_uid, qas.qa_session_id session_id
+FROM lams_rating r
+JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
+JOIN tl_laqa11_content qa ON qa.qa_content_id = rc.tool_content_id
+JOIN tl_laqa11_session qas ON qas.qa_content_id = qa.uid
+JOIN tl_laqa11_que_usr qau ON r.user_id = qau.que_usr_id AND qas.uid = qau.qa_session_id;
+
+UPDATE lams_rating r
+JOIN tmp_qa_rating_sessionid tmp ON r.uid = tmp.rating_uid
+SET r.tool_session_id = tmp.session_id;
+
+DROP TABLE tmp_qa_rating_sessionid;
+CREATE TEMPORARY TABLE tmp_qa_rating_sessionid AS
+SELECT r.uid rating_uid, qas.qa_session_id session_id
+FROM lams_rating_comment r
+JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
+JOIN tl_laqa11_content qa ON qa.qa_content_id = rc.tool_content_id
+JOIN tl_laqa11_session qas ON qas.qa_content_id = qa.uid
+JOIN tl_laqa11_que_usr qau ON r.user_id = qau.que_usr_id AND qas.uid = qau.qa_session_id;
+
+UPDATE lams_rating_comment r
+JOIN tmp_qa_rating_sessionid tmp ON r.uid = tmp.rating_uid
+SET r.tool_session_id = tmp.session_id;
+
+DROP TABLE tmp_qa_rating_sessionid;
+
+-- If there were no errors, commit and restore autocommit to on
+SET FOREIGN_KEY_CHECKS=0;
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/rating/RatingException.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/rating/RatingException.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/RatingException.java	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -0,0 +1,67 @@
+/****************************************************************
+ * 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.rating;
+
+public class RatingException extends java.lang.RuntimeException {
+
+    /**
+     * Creates a new instance of <code>RatingException</code> without detail message.
+     */
+    public RatingException() {
+    }
+
+    /**
+     * Constructs an instance of <code>RatingException</code> with the specified detail message.
+     * 
+     * @param msg
+     *            the detail message.
+     */
+    public RatingException(String msg) {
+	super(msg);
+    }
+
+    /**
+     * Constructs an instance of <code>RatingException</code>
+     * for wrapping both the customized error message and
+     * throwable exception object.
+     * 
+     * @param message
+     * @param cause
+     */
+    public RatingException(String message, Throwable cause) {
+	super(message, cause);
+    }
+
+    /**
+     * Constructs an instance of <code>RatingException</code>
+     * for wrapping an throwable exception object.
+     * 
+     * @param message
+     * @param cause
+     */
+    public RatingException(Throwable cause) {
+	super(cause);
+    }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/rating/ToolRatingManager.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/ToolRatingManager.java	(.../ToolRatingManager.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/ToolRatingManager.java	(.../ToolRatingManager.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -65,7 +65,7 @@
      * @param userId
      * @return
      */
-    List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+    List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId);
 
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingCommentDAO.java
===================================================================
diff -u -rab0ebee2c0b38fee4f7b362d6893f9d81bc3ba55 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingCommentDAO.java	(.../IRatingCommentDAO.java)	(revision ab0ebee2c0b38fee4f7b362d6893f9d81bc3ba55)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingCommentDAO.java	(.../IRatingCommentDAO.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -37,7 +37,7 @@
      * @param ratingCriteriaId
      * @return
      */
-    List<RatingCommentDTO> getCommentsByCriteria(Long ratingCriteriaId);
+    List<RatingCommentDTO> getCommentsByCriteria(Long ratingCriteriaId, Long toolSessionId);
 
     /**
      * Constructs ItemRatingCriteriaDTO for rating criteria that allows comments.
@@ -47,7 +47,7 @@
      * @param userId
      * @return
      */
-    List<RatingCommentDTO> getCommentsByCriteriaAndItem(Long ratingCriteriaId, Long itemId);
+    List<RatingCommentDTO> getCommentsByCriteriaAndItem(Long ratingCriteriaId, Long toolSessionId, Long itemId);
 
     /**
      * Constructs ItemRatingCriteriaDTO for rating criteria that allows comments. Returns comments only for itemIds
@@ -57,7 +57,7 @@
      * @param itemIds
      * @return
      */
-    List<RatingCommentDTO> getCommentsByCriteriaAndItems(Long ratingCriteriaId, Collection<Long> itemIds);
+    List<RatingCommentDTO> getCommentsByCriteriaAndItems(Long ratingCriteriaId, Long toolSessionId, Collection<Long> itemIds);
 
     List<RatingCommentDTO> getCommentsByCriteriaAndItemsAndUser(Long ratingCriteriaId, Collection<Long> itemIds,
 	    Integer userId);
Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java
===================================================================
diff -u -r223de22225bd6f7969f417b6d17ba681671af095 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java	(.../IRatingDAO.java)	(revision 223de22225bd6f7969f417b6d17ba681671af095)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java	(.../IRatingDAO.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -38,23 +38,27 @@
     
     void delete(Object object);
 
+    /** Not limiting by session as the userId is restrictive enough */
     Rating getRating(Long ratingCriteriaId, Integer userId, Long itemId);
 
-    List<Rating> getRatingsByItem(Long contentId, Long itemId);
+    /** Limiting by tool session */
+    List<Rating> getRatingsByItem(Long contentId, Long toolSessionId, Long itemId);
 
+    /** Not limiting by session as the userId is restrictive enough */
     List<Rating> getRatingsByUser(Long contentId, Integer userId);
 
+    /** Not limiting by session as the userId is restrictive enough */
     List<Rating> getRatingsByUserCriteria(Long criteriaId, Integer userId);
 
     /**
-     * Returns rating statistics by particular item
+     * Returns rating statistics by particular item. Limiting to a single session.
      *
      * @param itemId
      * @return
      */
-    ItemRatingCriteriaDTO getRatingAverageDTOByItem(Long ratingCriteriaId, Long itemId);
+    ItemRatingCriteriaDTO getRatingAverageDTOByItem(Long ratingCriteriaId, Long toolSessionId, Long itemId);
 
-    List<Object[]> getRatingAverageByContentAndItem(Long contentId, Long itemId);
+    List<Object[]> getRatingAverageByContentAndItem(Long contentId, Long toolSessionId, Long itemId);
 
     /**
      * Returns rating statistics for specified itemIds.
@@ -63,7 +67,7 @@
      * @param itemIds
      * @return
      */
-    List<Object[]> getRatingAverageByContentAndItems(Long contentId, Collection<Long> itemIds);
+    List<Object[]> getRatingAverageByContentAndItems(Long contentId, Long toolSessionId, Collection<Long> itemIds);
 
     /**
      * Returns rating statistics for entire tool.
@@ -97,27 +101,30 @@
     int getCountItemsRatedByUserByCriteria(final Long criteriaId, final Integer userId);
 
     /**
-     * Count how many users rated and commented each item.
+     * Count how many users rated and commented each item, limiting to a particular session if toolSessionId is not null
      *
      * @param contentId
      * @param itemIds
      * @param excludeUserId
      * @return
      */
-    Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Collection<Long> itemIds,
+    Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Long toolSessionId, final Collection<Long> itemIds,
 	    Integer excludeUserId);
 
     /**
-     * Count how many users rated and commented each item for a particular criteria.
+     * Count how many users rated and commented each item for a particular criteria, 
+     * limiting to a particular session if toolSessionId is not null
      *
      * @param contentId
      * @param itemIds
      * @param excludeUserId
      * @return
      */
-    Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Collection<Long> itemIds,
+    Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Long toolSessionId, final Collection<Long> itemIds,
 	    Integer excludeUserId);
+
     
+    
     /**
      *  Used by tools to get the ratings and comments relating to their items. To be used within SQL and supply the toolContentId as :toolContentId.
      *  See Peer Review for example usage.
Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
===================================================================
diff -u -rab0ebee2c0b38fee4f7b362d6893f9d81bc3ba55 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java	(.../RatingCommentDAO.java)	(revision ab0ebee2c0b38fee4f7b362d6893f9d81bc3ba55)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java	(.../RatingCommentDAO.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -39,35 +39,35 @@
 
     private static final String FIND_COMMENTS_BY_CRITERIA_AND_ITEM = "SELECT r.itemId, r.learner.userId, r.comment, CONCAT(r.learner.firstName, ' ', r.learner.lastName), r.postedDate "
 	    + "FROM " + RatingComment.class.getName()
-	    + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.itemId=?";
+	    + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.toolSessionId=? AND r.itemId=?";
 
     private static final String FIND_COMMENTS_BY_CRITERIA_AND_ITEMS = "SELECT r.itemId, r.learner.userId, r.comment, CONCAT(r.learner.firstName, ' ', r.learner.lastName), r.postedDate "
 	    + "FROM " + RatingComment.class.getName()
-	    + " AS r where r.ratingCriteria.ratingCriteriaId=:ratingCriteriaId AND r.itemId IN (:itemIds)";
+	    + " AS r where r.ratingCriteria.ratingCriteriaId=:ratingCriteriaId AND r.toolSessionId=:toolSessionId AND r.itemId IN (:itemIds)";
 
     private static final String FIND_COMMENTS_BY_CRITERIA_AND_ITEMS_AND_USER = "SELECT r.itemId, r.learner.userId, r.comment "
 	    + "FROM " + RatingComment.class.getName()
 	    + " AS r where r.ratingCriteria.ratingCriteriaId=:ratingCriteriaId AND r.itemId IN (:itemIds) AND r.learner.userId=:userId";
 
     private static final String FIND_COMMENTS_BY_CRITERIA = "SELECT r.itemId, r.learner.userId, r.comment " + "FROM "
-	    + RatingComment.class.getName() + " AS r where r.ratingCriteria.ratingCriteriaId=?";
+	    + RatingComment.class.getName() + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.toolSessionId=?";
 
     private static final String FIND_RELATED_COMMENT_BY_CRITERIA_AND_USER = "SELECT r.itemId, r.learner.userId, r.comment FROM " + RatingComment.class.getName()
 	    + " AS r where r.ratingCriteria.ratingCriteriaId=:ratingCriteriaId AND r.learner.userId=:userId";
 
     @Override
-    public List<RatingCommentDTO> getCommentsByCriteriaAndItem(Long ratingCriteriaId, Long itemId) {
+    public List<RatingCommentDTO> getCommentsByCriteriaAndItem(Long ratingCriteriaId, Long toolSessionId, Long itemId) {
 	List<Object[]> results = (List<Object[]>) (doFind(FIND_COMMENTS_BY_CRITERIA_AND_ITEM,
-		new Object[] { ratingCriteriaId, itemId }));
+		new Object[] { ratingCriteriaId, toolSessionId, itemId }));
 
 	return convertIntoCommentDtos(results);
     }
 
     @Override
-    public List<RatingCommentDTO> getCommentsByCriteriaAndItems(Long ratingCriteriaId, Collection<Long> itemIds) {
+    public List<RatingCommentDTO> getCommentsByCriteriaAndItems(Long ratingCriteriaId, Long toolSessionId, Collection<Long> itemIds) {
 
 	List<Object[]> results = getSession().createQuery(FIND_COMMENTS_BY_CRITERIA_AND_ITEMS)
-		.setLong("ratingCriteriaId", ratingCriteriaId).setParameterList("itemIds", itemIds).list();
+		.setLong("ratingCriteriaId", ratingCriteriaId).setLong("toolSessionId", toolSessionId).setParameterList("itemIds", itemIds).list();
 
 	return convertIntoCommentDtos(results);
     }
@@ -84,9 +84,9 @@
     }
 
     @Override
-    public List<RatingCommentDTO> getCommentsByCriteria(Long ratingCriteriaId) {
+    public List<RatingCommentDTO> getCommentsByCriteria(Long ratingCriteriaId, Long toolSessionId) {
 	List<Object[]> results = (List<Object[]>) (doFind(FIND_COMMENTS_BY_CRITERIA,
-		new Object[] { ratingCriteriaId }));
+		new Object[] { ratingCriteriaId, toolSessionId }));
 
 	return convertIntoCommentDtos(results);
     }
Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
===================================================================
diff -u -r8a760d56403394acfc11cf4ba9fe6a3fccfc83b9 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java	(.../RatingDAO.java)	(revision 8a760d56403394acfc11cf4ba9fe6a3fccfc83b9)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java	(.../RatingDAO.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.hibernate.Query;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.rating.dao.IRatingDAO;
 import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
@@ -46,14 +47,11 @@
     private static final String FIND_RATING_BY_CRITERIA_AND_USER_AND_ITEM = "FROM " + Rating.class.getName()
 	    + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.learner.userId=? AND r.itemId=?";
 
-    private static final String FIND_USER_RATING_VALUE = "SELECT r.rating FROM " + Rating.class.getName()
-	    + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.learner.userId=? AND r.itemId=?";
-
     private static final String FIND_RATING_BY_CRITERIA_AND_USER = "FROM " + Rating.class.getName()
 	    + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.learner.userId=?";
 
     private static final String FIND_RATINGS_BY_ITEM = "FROM " + Rating.class.getName()
-	    + " AS r where r.ratingCriteria.toolContentId=? AND r.itemId=?";
+	    + " AS r where r.ratingCriteria.toolContentId=? AND r.toolSessionId=? AND r.itemId=?";
 
     private static final String FIND_RATINGS_BY_USER = "FROM " + Rating.class.getName()
 	    + " AS r where r.ratingCriteria.toolContentId=? AND r.learner.userId=?";
@@ -62,15 +60,15 @@
 	    + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.learner.userId=?";
 
     private static final String FIND_RATING_AVERAGE_BY_ITEM = "SELECT AVG(r.rating), COUNT(*) FROM "
-	    + Rating.class.getName() + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.itemId=?";
+	    + Rating.class.getName() + " AS r where r.ratingCriteria.ratingCriteriaId=? AND r.toolSessionId=? AND r.itemId=?";
 
     private static final String FIND_RATING_AVERAGE_BY_CONTENT_AND_ITEM = "SELECT r.itemId, r.ratingCriteria.ratingCriteriaId, AVG(r.rating), COUNT(*) FROM "
 	    + Rating.class.getName()
-	    + " AS r where r.ratingCriteria.toolContentId=? AND r.itemId=? GROUP BY r.ratingCriteria.ratingCriteriaId";
+	    + " AS r where r.ratingCriteria.toolContentId=? AND r.toolSessionId=? AND r.itemId=? GROUP BY r.ratingCriteria.ratingCriteriaId";
 
     private static final String FIND_RATING_AVERAGE_BY_CONTENT_AND_ITEMS = "SELECT r.itemId, r.ratingCriteria.ratingCriteriaId, AVG(r.rating), COUNT(*) FROM "
 	    + Rating.class.getName()
-	    + " AS r where r.ratingCriteria.toolContentId=:contentId AND r.itemId IN (:itemIds) GROUP BY r.itemId, r.ratingCriteria.ratingCriteriaId";
+	    + " AS r where r.ratingCriteria.toolContentId=:contentId AND r.toolSessionId=:toolSessionId AND r.itemId IN (:itemIds) GROUP BY r.itemId, r.ratingCriteria.ratingCriteriaId";
 
     private static final String FIND_RATING_AVERAGE_BY_CONTENT_ID = "SELECT r.itemId, r.ratingCriteria.ratingCriteriaId, AVG(r.rating), COUNT(*) FROM "
 	    + Rating.class.getName()
@@ -139,8 +137,8 @@
     }
 
     @Override
-    public List<Rating> getRatingsByItem(Long contentId, Long itemId) {
-	return super.find(FIND_RATINGS_BY_ITEM, new Object[] { contentId, itemId });
+    public List<Rating> getRatingsByItem(Long contentId, Long toolSessionId, Long itemId) {
+	return super.find(FIND_RATINGS_BY_ITEM, new Object[] { contentId, toolSessionId, itemId });
     }
 
     // method is not used at the moment
@@ -165,9 +163,9 @@
     }
 
     @Override
-    public ItemRatingCriteriaDTO getRatingAverageDTOByItem(Long ratingCriteriaId, Long itemId) {
+    public ItemRatingCriteriaDTO getRatingAverageDTOByItem(Long ratingCriteriaId, Long toolSessionId, Long itemId) {
 	List<Object[]> list = (List<Object[]>) doFind(FIND_RATING_AVERAGE_BY_ITEM,
-		new Object[] { ratingCriteriaId, itemId });
+		new Object[] { ratingCriteriaId, toolSessionId, itemId });
 	Object[] results = list.get(0);
 
 	Object averageRatingObj = (results[0] == null) ? 0 : results[0];
@@ -176,17 +174,21 @@
 	return new ItemRatingCriteriaDTO((Number)averageRatingObj, numberOfVotes);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public List<Object[]> getRatingAverageByContentAndItem(Long contentId, Long itemId) {
-	return (List<Object[]>) doFind(FIND_RATING_AVERAGE_BY_CONTENT_AND_ITEM, new Object[] { contentId, itemId });
+    public List<Object[]> getRatingAverageByContentAndItem(Long contentId, Long toolSessionId, Long itemId) {
+	return (List<Object[]>) doFind(FIND_RATING_AVERAGE_BY_CONTENT_AND_ITEM, new Object[] { contentId, toolSessionId, itemId });
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public List<Object[]> getRatingAverageByContentAndItems(Long contentId, Collection<Long> itemIds) {
+    public List<Object[]> getRatingAverageByContentAndItems(Long contentId, Long toolSessionId, Collection<Long> itemIds) {
 	return getSession().createQuery(FIND_RATING_AVERAGE_BY_CONTENT_AND_ITEMS).setLong("contentId", contentId)
+		.setLong("toolSessionId", toolSessionId)
 		.setParameterList("itemIds", itemIds).list();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public List<Object[]> getRatingAverageByContent(Long contentId) {
 	return (List<Object[]>) doFind(FIND_RATING_AVERAGE_BY_CONTENT_ID, new Object[] { contentId });
@@ -202,6 +204,7 @@
 	}
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public int getCountItemsRatedByUser(final Long toolContentId, final Integer userId) {
 
@@ -225,6 +228,7 @@
 	return unionItemIds.size();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public int getCountItemsRatedByUserByCriteria(final Long criteriaId, final Integer userId) {
 
@@ -248,8 +252,9 @@
 	return unionItemIds.size();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Collection<Long> itemIds,
+    public Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Long toolSessionId, final Collection<Long> itemIds,
 	    Integer excludeUserId) {
 
 	HashMap<Long, Long> itemIdToRatedUsersCountMap = new HashMap<Long, Long>();
@@ -260,25 +265,27 @@
 	// unions don't work in HQL so doing 2 separate DB queries (http://stackoverflow.com/a/3940445)
 	String FIND_ITEMID_USERID_PAIRS_BY_CONTENT_AND_ITEMS = "SELECT r.itemId, r.learner.userId FROM "
 		+ Rating.class.getName()
-		+ " AS r where r.ratingCriteria.toolContentId=:contentId AND r.itemId IN (:itemIds)";
+		+ " AS r where r.ratingCriteria.toolContentId=:contentId AND r.itemId IN (:itemIds)"
+		+ " AND r.toolSessionId=:toolSessionId";
 
 	String FIND_ITEMID_USERID_COMMENT_PAIRS_BY_CONTENT_AND_ITEMS = "SELECT comment.itemId, comment.learner.userId FROM "
 		+ RatingComment.class.getName()
-		+ " AS r where comment.ratingCriteria.toolContentId=:contentId AND comment.itemId IN (:itemIds) AND comment.ratingCriteria.commentsEnabled IS TRUE";
+		+ " AS r where comment.ratingCriteria.toolContentId=:contentId AND comment.itemId IN (:itemIds) AND comment.ratingCriteria.commentsEnabled IS TRUE"
+		+ " AND comment.toolSessionId=:toolSessionId";
 
-	List<Object[]> ratedItemObjs = getSession().createQuery(FIND_ITEMID_USERID_PAIRS_BY_CONTENT_AND_ITEMS)
-		.setLong("contentId", contentId).setParameterList("itemIds", itemIds).list();
+	List<Object[]> ratedItemObjs  = getSession().createQuery(FIND_ITEMID_USERID_PAIRS_BY_CONTENT_AND_ITEMS)
+		.setLong("contentId", contentId).setLong("toolSessionId", toolSessionId).setParameterList("itemIds", itemIds).list();
 
-	List<Object[]> commentedItemObjs = getSession()
-		.createQuery(FIND_ITEMID_USERID_COMMENT_PAIRS_BY_CONTENT_AND_ITEMS).setLong("contentId", contentId)
-		.setParameterList("itemIds", itemIds).list();
+	List<Object[]> commentedItemObjs =	getSession().createQuery(FIND_ITEMID_USERID_COMMENT_PAIRS_BY_CONTENT_AND_ITEMS).setLong("contentId", contentId)
+		.setParameterList("itemIds", itemIds).setLong("toolSessionId", toolSessionId).list();
 
 	return createUsersRatedEachItem(itemIds, excludeUserId, itemIdToRatedUsersCountMap, ratedItemObjs,
 		commentedItemObjs);
     }
     
+    @SuppressWarnings("unchecked")
     @Override
-    public Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Collection<Long> itemIds,
+    public Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Long toolSessionId, final Collection<Long> itemIds,
 	    Integer excludeUserId) {
 
 	HashMap<Long, Long> itemIdToRatedUsersCountMap = new HashMap<Long, Long>();
@@ -289,19 +296,22 @@
 	// unions don't work in HQL so doing 2 separate DB queries (http://stackoverflow.com/a/3940445)
 	String FIND_ITEMID_USERID_PAIRS_BY_CONTENT_AND_ITEMS = "SELECT r.itemId, r.learner.userId FROM "
 		+ Rating.class.getName()
-		+ " AS r where r.ratingCriteria.ratingCriteriaId=:criteriaId AND r.itemId IN (:itemIds)";
+		+ " AS r where r.ratingCriteria.ratingCriteriaId=:criteriaId AND r.itemId IN (:itemIds)"
+		+ " AND r.toolSessionId=:toolSessionId";
 
 	String FIND_ITEMID_USERID_COMMENT_PAIRS_BY_CONTENT_AND_ITEMS = "SELECT comment.itemId, comment.learner.userId FROM "
 		+ RatingComment.class.getName()
 		+ " AS r where comment.ratingCriteria.ratingStyle=0 AND comment.ratingCriteria.ratingCriteriaId=:criteriaId "
-		+ " AND comment.itemId IN (:itemIds) AND comment.ratingCriteria.commentsEnabled IS TRUE";
+		+ " AND comment.itemId IN (:itemIds) AND comment.ratingCriteria.commentsEnabled IS TRUE"
+		+ " AND comment.toolSessionId=:toolSessionId";
 
+
 	List<Object[]> ratedItemObjs = getSession().createQuery(FIND_ITEMID_USERID_PAIRS_BY_CONTENT_AND_ITEMS)
-		.setLong("criteriaId", criteriaId).setParameterList("itemIds", itemIds).list();
+		.setLong("criteriaId", criteriaId).setLong("toolSessionId", toolSessionId).setParameterList("itemIds", itemIds).list();
 
 	List<Object[]> commentedItemObjs = getSession()
 		.createQuery(FIND_ITEMID_USERID_COMMENT_PAIRS_BY_CONTENT_AND_ITEMS).setLong("criteriaId", criteriaId)
-		.setParameterList("itemIds", itemIds).list();
+		.setParameterList("itemIds", itemIds).setLong("toolSessionId", toolSessionId).list();
 
 	return createUsersRatedEachItem(itemIds, excludeUserId, itemIdToRatedUsersCountMap, ratedItemObjs,
 		commentedItemObjs);
Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/Rating.java
===================================================================
diff -u -r42cd8d7da9fa6615dbd82d376984000024b4b0fe -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/model/Rating.java	(.../Rating.java)	(revision 42cd8d7da9fa6615dbd82d376984000024b4b0fe)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/model/Rating.java	(.../Rating.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -42,6 +42,8 @@
     private User learner;
 
     private Float rating;
+    
+    private Long toolSessionId;
 
     public Rating() {
     }
@@ -53,6 +55,14 @@
 	this.rating = rating;
     }
 
+    public Rating(Long itemId, RatingCriteria ratingCriteria, User learner, Long toolSessionId, Float rating) {
+	this.itemId = itemId;
+	this.ratingCriteria = ratingCriteria;
+	this.learner = learner;
+	this.toolSessionId = toolSessionId;
+	this.rating = rating;
+    }
+
     /**
      */
     public Long getUid() {
@@ -102,4 +112,12 @@
     public Float getRating() {
 	return this.rating;
     }
+
+    public Long getToolSessionId() {
+	return toolSessionId;
+    }
+
+    public void setToolSessionId(Long toolSessionId) {
+	this.toolSessionId = toolSessionId;
+    }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java	(.../RatingComment.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java	(.../RatingComment.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -44,6 +44,8 @@
     private String comment;
 
     private Date postedDate;
+    
+    private Long toolSessionId;
 
     public RatingComment() {
 	this.postedDate = new Date();
@@ -57,6 +59,15 @@
 	this.postedDate = new Date();
     }
 
+    public RatingComment(Long itemId, RatingCriteria ratingCriteria, User learner, Long toolSessionId, String comment) {
+	this.itemId = itemId;
+	this.ratingCriteria = ratingCriteria;
+	this.learner = learner;
+	this.toolSessionId = toolSessionId;
+	this.comment = comment;
+	this.postedDate = new Date();
+    }
+
     /**
      */
     public Long getUid() {
@@ -112,4 +123,13 @@
     public void setPostedDate(Date postedDate) {
 	this.postedDate = postedDate;
     }
+    
+    public Long getToolSessionId() {
+	return toolSessionId;
+    }
+
+    public void setToolSessionId(Long toolSessionId) {
+	this.toolSessionId = toolSessionId;
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java
===================================================================
diff -u -rab0ebee2c0b38fee4f7b362d6893f9d81bc3ba55 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java	(.../IRatingService.java)	(revision ab0ebee2c0b38fee4f7b362d6893f9d81bc3ba55)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java	(.../IRatingService.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -33,9 +33,11 @@
 
 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;
 import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
+import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 import org.lamsfoundation.lams.rating.model.Rating;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 
@@ -48,7 +50,7 @@
      * Returns the number of "real" ratings, which should be newRatings.size.
      * @return
      */
-    public int rateItems(RatingCriteria ratingCriteria, 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
@@ -61,10 +63,25 @@
      */
     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
+     * @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
+     * @param toolContentId
+     * @return
+     */
+    public int deleteAllRatingCriterias(Long toolContentId);
+    
     List<RatingCriteria> getCriteriasByToolContentId(Long toolContentId);
 
     RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId);
 
+    @SuppressWarnings("rawtypes")
     RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId, Class clasz);
 
     /**
@@ -100,9 +117,9 @@
      */
     List<Rating> getRatingsByItem(Long itemId);
 
-    ItemRatingCriteriaDTO rateItem(RatingCriteria criteria, Integer userId, Long itemId, float ratingFloat);
+    ItemRatingCriteriaDTO rateItem(RatingCriteria criteria, Long toolSessionId, Integer userId, Long itemId, float ratingFloat);
 
-    void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment);
+    void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId, String comment);
 
     /**
      * Returns results for all items. If result is needed for only one item provide provide it as a single element in a
@@ -115,7 +132,7 @@
      * @param userId
      * @return
      */
-    List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+    List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId);
 
     /**
@@ -138,8 +155,8 @@
      * 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 currentUser, boolean includeCurrentUser, List<Object[]> rawDataRows, boolean needRatesPerUser) throws JSONException;
-
+    JSONArray convertToStyledJSON(RatingCriteria ratingCriteria, Long toolSessionId, Long currentUserId, boolean includeCurrentUser, 
+	    List<Object[]> rawDataRows, boolean needRatesPerUser) throws JSONException;
     /**
      * 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.
@@ -170,17 +187,18 @@
     void removeUserCommitsByContent(final Long contentId, final Integer userId);
     
     /**
-     * Count how many users rated and commented each item.
+     * 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 Collection<Long> itemIds,
+    Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Long toolSessionId, final Collection<Long> itemIds,
 	    Integer excludeUserId);
     
-    Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Collection<Long> itemIds,
+    Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Long toolSessionId, final Collection<Long> itemIds,
 	    Integer excludeUserId);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
===================================================================
diff -u -rab0ebee2c0b38fee4f7b362d6893f9d81bc3ba55 -r5dbbc7b9946ede2b5de406e9adb39928e1dda083
--- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(.../RatingService.java)	(revision ab0ebee2c0b38fee4f7b362d6893f9d81bc3ba55)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(.../RatingService.java)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
@@ -29,7 +29,6 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -43,20 +42,20 @@
 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;
 import org.lamsfoundation.lams.rating.dao.IRatingDAO;
 import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.dto.RatingCommentDTO;
-import org.lamsfoundation.lams.rating.dto.RatingDTO;
 import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
 import org.lamsfoundation.lams.rating.dto.StyledRatingDTO;
+import org.lamsfoundation.lams.rating.model.AuthoredItemRatingCriteria;
 import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
 import org.lamsfoundation.lams.rating.model.Rating;
 import org.lamsfoundation.lams.rating.model.RatingComment;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
-import org.lamsfoundation.lams.rating.model.ToolActivityRatingCriteria;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
@@ -108,26 +107,26 @@
 	    ratingDAO.delete(comment);
 	}
     }
-
+    
     @Override
-    public Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Collection<Long> itemIds,
+    public Map<Long, Long> countUsersRatedEachItem(final Long contentId, final Long toolSessionId, final Collection<Long> itemIds,
 	    Integer excludeUserId) {
-	return ratingDAO.countUsersRatedEachItem(contentId, itemIds, excludeUserId);
+	return ratingDAO.countUsersRatedEachItem(contentId, toolSessionId, itemIds, excludeUserId);
     }
 
     @Override
-    public Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Collection<Long> itemIds,
+    public Map<Long, Long> countUsersRatedEachItemByCriteria(final Long criteriaId, final Long toolSessionId, final Collection<Long> itemIds,
 	    Integer excludeUserId) {
-	return ratingDAO.countUsersRatedEachItemByCriteria(criteriaId, itemIds, excludeUserId);
+	return ratingDAO.countUsersRatedEachItemByCriteria(criteriaId, toolSessionId, itemIds, excludeUserId);
     }
-    
+
     @Override
     public void saveOrUpdateRating(Rating rating) {
 	ratingDAO.saveOrUpdate(rating);
     }
 
     @Override
-    public ItemRatingCriteriaDTO rateItem(RatingCriteria ratingCriteria, Integer userId, Long itemId,
+    public ItemRatingCriteriaDTO rateItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId,
 	    float ratingFloat) {
 
 	Long ratingCriteriaId = ratingCriteria.getRatingCriteriaId();
@@ -142,17 +141,18 @@
 	    rating.setLearner(learner);
 
 	    rating.setRatingCriteria(ratingCriteria);
+	    rating.setToolSessionId(toolSessionId);
 	}
 
 	rating.setRating(ratingFloat);
 	ratingDAO.saveOrUpdate(rating);
 
 	// to make available new changes be visible on a jsp page
-	return ratingDAO.getRatingAverageDTOByItem(ratingCriteriaId, itemId);
+	return ratingDAO.getRatingAverageDTOByItem(ratingCriteriaId, toolSessionId, itemId);
     }
 
     @Override
-    public int rateItems(RatingCriteria ratingCriteria, 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;
@@ -176,6 +176,7 @@
 	    rating.setLearner(learner);
 	    rating.setRatingCriteria(ratingCriteria);
 	    rating.setRating(entry.getValue());
+	    rating.setToolSessionId(toolSessionId);
 	    ratingDAO.saveOrUpdate(rating);
 	    numRatings++;
 	}
@@ -184,7 +185,7 @@
     }
     
     @Override
-    public void commentItem(RatingCriteria ratingCriteria, 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
@@ -196,14 +197,15 @@
 	    ratingComment.setLearner(learner);
 
 	    ratingComment.setRatingCriteria(ratingCriteria);
+	    ratingComment.setToolSessionId(toolSessionId);
 	}
 
 	ratingComment.setComment(comment);
 	ratingDAO.saveOrUpdate(ratingComment);
     }
 
     @Override
-    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
+    public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
 
 	// fail safe - if there are no items, don't try to look anything up! LDEV-4094
@@ -219,18 +221,18 @@
 	Long singleItemId = isSingleItem ? itemIds.iterator().next() : null;
 
 	//handle comments criteria
-	List<ItemRatingDTO> itemDtos = handleCommentsCriteria(criterias, itemIds, isCommentsByOtherUsersRequired,
+	List<ItemRatingDTO> itemDtos = handleCommentsCriteria(criterias, toolSessionId, itemIds, isCommentsByOtherUsersRequired,
 		userId);
 
 	//get all data from DB
 	List<Rating> userRatings = ratingDAO.getRatingsByUser(contentId, userId.intValue());
 	List<Object[]> itemsStatistics;
 	if (isSingleItem) {
-	    itemsStatistics = ratingDAO.getRatingAverageByContentAndItem(contentId, singleItemId);
+	    itemsStatistics = ratingDAO.getRatingAverageByContentAndItem(contentId, toolSessionId, singleItemId);
 
 	    // query DB using itemIds
 	} else {
-	    itemsStatistics = ratingDAO.getRatingAverageByContentAndItems(contentId, itemIds);
+	    itemsStatistics = ratingDAO.getRatingAverageByContentAndItems(contentId, toolSessionId, itemIds);
 	}
 
 	//handle all criterias except for comments' one
@@ -295,7 +297,7 @@
     /*
      * Fetches all required comments from the DB.
      */
-    private List<ItemRatingDTO> handleCommentsCriteria(List<RatingCriteria> criterias, Collection<Long> itemIds,
+    private List<ItemRatingDTO> handleCommentsCriteria(List<RatingCriteria> criterias, Long toolSessionId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
 
 	boolean isSingleItem = itemIds.size() == 1;
@@ -310,11 +312,11 @@
 
 		List<RatingCommentDTO> commentDtos;
 		if (isSingleItem) {
-		    commentDtos = ratingCommentDAO.getCommentsByCriteriaAndItem(commentCriteriaId, singleItemId);
+		    commentDtos = ratingCommentDAO.getCommentsByCriteriaAndItem(commentCriteriaId, toolSessionId, singleItemId);
 
 		    //query DB using itemIds
 		} else if (isCommentsByOtherUsersRequired) {
-		    commentDtos = ratingCommentDAO.getCommentsByCriteriaAndItems(commentCriteriaId, itemIds);
+		    commentDtos = ratingCommentDAO.getCommentsByCriteriaAndItems(commentCriteriaId, toolSessionId, itemIds);
 
 		    // get only comments done by the specified user
 		} else {
@@ -372,12 +374,80 @@
 	return ratingCriteriaDAO.getByRatingCriteriaId(ratingCriteriaId);
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     public RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId, Class clasz) {
 	return ratingCriteriaDAO.getByRatingCriteriaId(ratingCriteriaId, clasz);
     }
 
+    
+    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);
+	criteria.setRatingStyle(ratingStyle);
+	criteria.setOrderId(orderId);
+	criteria.setTitle(title);
+	criteria.setCommentsEnabled(withComments);
+	criteria.setCommentsMinWordsLimit(minWordsInComment);
+	criteria.setMinimumRates(null);
+	criteria.setMaximumRates(null);
+	
+	Integer maxRating = null;
+	switch (ratingStyle) {
+	    case RatingCriteria.RATING_STYLE_STAR:
+		maxRating = RatingCriteria.RATING_STYLE_STAR_DEFAULT_MAX;
+		break;
+	    case RatingCriteria.RATING_STYLE_RANKING:
+		maxRating = RatingCriteria.RATING_STYLE_RANKING_DEFAULT_MAX;
+		break;
+	    case RatingCriteria.RATING_STYLE_HEDGING:
+	    case RatingCriteria.RATING_STYLE_COMMENT:
+		maxRating = 0;
+		break;
+	}
+	criteria.setMaxRating(maxRating);
+	return criteria;
+    }
+    
     @Override
+    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())
+					.toString();
+			log.error(msg);
+			throw new RatingException(msg);
+		    }
+		criteria = (LearnerItemRatingCriteria)c;
+		break;
+	    }
+	} 
+	criteria = updateLearnerItemRatingCriteria(criteria, toolContentId, title, orderId, ratingStyle, withComments, minWordsInComment);
+	ratingCriteriaDAO.saveOrUpdate(criteria);
+	return criteria;
+    }
+
+    @Override
+    public int deleteAllRatingCriterias(Long toolContentId) {
+	List<RatingCriteria> criterias = ratingCriteriaDAO.getByToolContentId(toolContentId);
+	int count = 0;
+	for ( RatingCriteria criteria : criterias ) {
+	    ratingCriteriaDAO.deleteRatingCriteria(criteria.getRatingCriteriaId());
+	    count++;
+	}
+	return count;
+    }
+
+    @Override
     public void saveRatingCriterias(HttpServletRequest request, Collection<RatingCriteria> oldCriterias,
 	    Long toolContentId) {
 	
@@ -593,6 +663,9 @@
      * 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)+
@@ -602,7 +675,7 @@
      * @throws JSONException 
      */
     @Override
-    public JSONArray convertToStyledJSON(RatingCriteria ratingCriteria, Long currentUserId, boolean includeCurrentUser, 
+    public JSONArray convertToStyledJSON(RatingCriteria ratingCriteria, Long toolSessionId, Long currentUserId, boolean includeCurrentUser, 
 	    List<Object[]> rawDataRows, boolean needRatesPerUser) throws JSONException {
 
 	JSONArray rows = new JSONArray();
@@ -656,7 +729,7 @@
 	    }
 	    
 	    if ( needRatesPerUser ) {
-		Map<Long, Long> countUsersRatedEachItemMap = ratingDAO.countUsersRatedEachItemByCriteria(ratingCriteria.getRatingCriteriaId(), itemIds, -1);
+		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"));