Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb18a6a6612d0980d0d3d8952e18286ba93b3c305 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b18a6a6612d0980d0d3d8952e18286ba93b3c305)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 07:14:53 CST 2019 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 05:52:09 CST 2019 
  
 #=================== labels for LAMS Administration =================# 
 
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rb18a6a6612d0980d0d3d8952e18286ba93b3c305 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision b18a6a6612d0980d0d3d8952e18286ba93b3c305)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 07:14:53 CST 2019 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 05:52:09 CST 2019 
  
 #=================== labels for LAMS Administration =================# 
 
@@ -663,4 +663,4 @@
 label.area.question.bank  =Question bank
 
 
-#======= End labels: Exported 655 labels for en AU =====
+#======= End labels: Exported 652 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -rb18a6a6612d0980d0d3d8952e18286ba93b3c305 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_admin/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision b18a6a6612d0980d0d3d8952e18286ba93b3c305)
+++ lams_admin/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -2,7 +2,7 @@
 #language code: es 
 #locale code: ES 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 07:14:51 CST 2019 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 05:52:07 CST 2019 
  
 #=================== labels for LAMS Administration =================# 
 
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Fri Dec 28 00:41:13 CST 2018 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 05:36:50 CST 2019 
  
 #=================== labels for LAMS Central =================# 
 
@@ -984,7 +984,10 @@
 label.multiple.lessons  =Multiple lessons
 label.add.lessons.to.subgroups  =Add lesson to all selected subcourses
 label.marks  =Marks
-authoring.fla.grouping.detached.error =Activity "{0}" was grouped with a grouping activity that is missing or is not one of previous activities. Grouping was cleared.
-authoring.fla.input.detached.error =Activity "{0}" had an input activity that is missing or is not one of previous activities. Input was cleared.
+authoring.fla.grouping.detached.error  =Activity "{0}" was grouped with a grouping activity that is missing or is not one of previous activities. Grouping was cleared.
+authoring.fla.input.detached.error  =Activity "{0}" had an input activity that is missing or is not one of previous activities. Input was cleared.
+label.question.not.added  =This question has already been added
+label.questions.choice.collection  =Choose a collection:
 
-#======= End labels: Exported 892 labels for en AU =====
+
+#======= End labels: Exported 896 labels for en AU =====
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r33aeeae9d9764b3411e04a48ee165e526c240f44 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 33aeeae9d9764b3411e04a48ee165e526c240f44)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -2,7 +2,11 @@
 #language code: en 
 #locale code: AU 
 
+<<<<<<< HEAD
  # Exported from the LAMS Community by Ernie Ghiglione on Fri Dec 28 00:41:13 CST 2018 
+=======
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 05:36:50 CST 2019 
+>>>>>>> develop
  
 #=================== labels for LAMS Central =================# 
 
@@ -988,5 +992,10 @@
 label.multiple.lessons  =Multiple lessons
 label.add.lessons.to.subgroups  =Add lesson to all selected subcourses
 label.marks  =Marks
+authoring.fla.grouping.detached.error  =Activity "{0}" was grouped with a grouping activity that is missing or is not one of previous activities. Grouping was cleared.
+authoring.fla.input.detached.error  =Activity "{0}" had an input activity that is missing or is not one of previous activities. Input was cleared.
 label.question.not.added  =This question has already been added
-#======= End labels: Exported 872 labels for en AU =====
+label.questions.choice.collection  =Choose a collection:
+
+
+#======= End labels: Exported 896 labels for en AU =====
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r0483acb3c9e3b07f42d9511bbfea3708029438e8 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 0483acb3c9e3b07f42d9511bbfea3708029438e8)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -86,19 +86,22 @@
 		</property> 
 		<property name="transactionAttributes">
 			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="find*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="canEditGroup">PROPAGATION_REQUIRED</prop>
 				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
 				<prop key="delete*">PROPAGATION_REQUIRED</prop>
 				<prop key="disable*">PROPAGATION_REQUIRED</prop>
-				<prop key="set*">PROPAGATION_REQUIRED</prop>
+				<prop key="find*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="hasRoleInOrganisation">PROPAGATION_REQUIRED</prop>
 				<prop key="is*">PROPAGATION_REQUIRED</prop>
+				<prop key="log*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="set*">PROPAGATION_REQUIRED</prop>
 				<prop key="toggleOrganisationFavorite">PROPAGATION_REQUIRED</prop>
-				<prop key="userHasData">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
 				<prop key="upload*">PROPAGATION_REQUIRED</prop>
+				<prop key="userHasData">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
@@ -124,13 +127,14 @@
 		</property>
 		<property name="transactionAttributes">
 			<props>
-				<prop key="validateLearningDesign">PROPAGATION_REQUIRED</prop>
-				<prop key="setValid">PROPAGATION_REQUIRED</prop>
+				<prop key="fillLearningLibraryID">PROPAGATION_REQUIRED</prop>
+				<prop key="internationaliseActivityTitle">PROPAGATION_REQUIRED</prop>
 				<prop key="getAllLearningLibraryDetails">PROPAGATION_REQUIRED</prop>
-				<prop key="getToolDTOs">PROPAGATION_REQUIRED</prop>
 				<prop key="getLearning*">PROPAGATION_REQUIRED</prop>
+				<prop key="getToolDTOs">PROPAGATION_REQUIRED</prop>
 				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="fillLearningLibraryID">PROPAGATION_REQUIRED</prop>
+				<prop key="setValid">PROPAGATION_REQUIRED</prop>
+				<prop key="validateLearningDesign">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
@@ -155,13 +159,14 @@
 		</property>
 		<property name="transactionAttributes">
 			<props>
-				<prop key="perform*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
 				<prop key="add*">PROPAGATION_REQUIRED</prop>
+				<prop key="checkLessonReleaseConditions">PROPAGATION_REQUIRED</prop>
 				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="perform*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
 				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
@@ -183,8 +188,8 @@
 		<property name="transactionAttributes">
 			<props>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="removeTheme">PROPAGATION_REQUIRED</prop>
 				<prop key="store*">PROPAGATION_REQUIRED</prop>
-				<prop key="set*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
@@ -205,6 +210,7 @@
 		<property name="transactionAttributes">
 			<props>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="set*">PROPAGATION_REQUIRED</prop>
 				<prop key="update*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
@@ -227,11 +233,11 @@
 		</property>
 		<property name="transactionAttributes">
 			<props>
-				<prop key="sign*">PROPAGATION_REQUIRED</prop>
 				<prop key="contextExists">PROPAGATION_REQUIRED</prop>
 				<prop key="courseKeyIsValid">PROPAGATION_REQUIRED</prop>
 				<prop key="emailVerify">PROPAGATION_REQUIRED</prop>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="sign*">PROPAGATION_REQUIRED</prop>
 				<prop key="usernameExists">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
@@ -254,12 +260,14 @@
 		</property>
 		<property name="transactionAttributes">
 			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="is*">PROPAGATION_REQUIRED</prop>
 				<prop key="store*">PROPAGATION_REQUIRED</prop>
-				<prop key="change*">PROPAGATION_REQUIRED</prop>
+				<prop key="toggle*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
-	
+
 	<bean id="exportToolContentServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.ExportToolContentService">
 		<property name="learningDesignService"><ref bean="learningDesignService"/></property>
 		<property name="messageService"><ref bean="commonMessageService"/></property>
@@ -291,10 +299,9 @@
 		
 		<property name="transactionAttributes">
 			<props>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
 				<prop key="export*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
 				<prop key="import*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
+				<prop key="register*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
@@ -332,10 +339,11 @@
 		
 		<property name="transactionAttributes">
 			<props>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
 				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
@@ -362,13 +370,16 @@
 		</property>
 		<property name="transactionAttributes">
 			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
 				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="commentItem">PROPAGATION_REQUIRED</prop>
+				<prop key="convertToStyled">PROPAGATION_REQUIRED</prop>
+				<prop key="countUsersRatedEachItem*">PROPAGATION_REQUIRED</prop>
 				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="is*">PROPAGATION_REQUIRED</prop>
 				<prop key="rate*">PROPAGATION_REQUIRED</prop>
-				<prop key="commentItem">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 
@@ -421,14 +432,14 @@
 			<props>
 				<prop key="create*">PROPAGATION_REQUIRED</prop>
 				<prop key="eventExists">PROPAGATION_REQUIRED</prop>
-				<prop key="sendMessage">PROPAGATION_REQUIRED</prop>
-				<prop key="resendMessages">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="isSubscribed">PROPAGATION_REQUIRED</prop>
 				<prop key="notify*">PROPAGATION_REQUIRED</prop>
+				<prop key="resendMessages">PROPAGATION_REQUIRED</prop>
+				<prop key="sendMessage">PROPAGATION_REQUIRED</prop>
 				<prop key="subscribe">PROPAGATION_REQUIRED</prop>
-				<prop key="unsubscribe">PROPAGATION_REQUIRED</prop>
 				<prop key="trigger*">PROPAGATION_REQUIRED</prop>
-				<prop key="isSubscribed">PROPAGATION_REQUIRED</prop>
-				<prop key="getNotification*">PROPAGATION_REQUIRED</prop>
+				<prop key="unsubscribe">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
@@ -469,7 +480,7 @@
 		<property name="transactionAttributes">
 			<props>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="logEvent">PROPAGATION_REQUIRED</prop>
+				<prop key="log*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>	
@@ -492,8 +503,11 @@
 		<property name="proxyTargetClass"><value>true</value></property> 
 		<property name="transactionAttributes">
 			<props>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
 				<prop key="persist*">PROPAGATION_REQUIRED</prop>
+				<prop key="refreshCache">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7ea7cfd9473193e80d9303bee75ae82ff0c7be4c -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7ea7cfd9473193e80d9303bee75ae82ff0c7be4c)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 07:16:04 CST 2019 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 05:47:31 CST 2019 
  
 #=================== labels for Learner (Java) =================# 
 
@@ -192,7 +192,13 @@
 button.kumalive.poll.chart.switch  =Switch chart
 outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
 label.learners  ={0} learners
+<<<<<<< HEAD
 outcome.authoring.create.new  =[create new]
 
 
 #======= End labels: Exported 187 labels for en AU =====
+=======
+
+
+#======= End labels: Exported 186 labels for en AU =====
+>>>>>>> develop
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r7ea7cfd9473193e80d9303bee75ae82ff0c7be4c -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7ea7cfd9473193e80d9303bee75ae82ff0c7be4c)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 07:16:04 CST 2019 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 05:47:31 CST 2019 
  
 #=================== labels for Learner (Java) =================# 
 
Index: lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r5e1548fd8c9caed9a861784801054363e2efb400 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_learning/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 5e1548fd8c9caed9a861784801054363e2efb400)
+++ lams_learning/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -192,6 +192,7 @@
 button.kumalive.poll.chart.switch  =Cambiar gr\u00e1fico
 outcome.authoring.remove.confirm  =\u00bfEst\u00e1 seguro que desea eliminar?
 label.learners  ={0} estudiantes
+outcome.authoring.create.new  =[crear nuevo]
 
 
-#======= End labels: Exported 186 labels for es ES =====
+#======= End labels: Exported 187 labels for es ES =====
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -r670dd8e248dc4705c92031c79d05a99559e35024 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 670dd8e248dc4705c92031c79d05a99559e35024)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -138,30 +138,35 @@
 		</property>
         <property name="transactionAttributes">
             <props>
-                <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="update*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="store*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="set*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="unset*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="allocateAnswerToOption">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="launchTimeLimit">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="processUserAnswers">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+				<prop key="allocateAnswerToOption">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+            	<prop key="audit*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
                 <prop key="changeQuestionResultMark">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="notify*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="copyToolContent">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="leaveToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="finishToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-			    <prop key="importToolContent">PROPAGATION_REQUIRED,+java.lang.Exception</prop>                
-                <prop key="exportToolContent">PROPAGATION_REQUIRED,+java.lang.Exception</prop>                      
-				<prop key="import102ToolContent">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
 				<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
 				<prop key="copyAnswersFromLeader">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
+                <prop key="copyToolContent">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="count*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>               
+                <prop key="export*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>  
+                <prop key="finishToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="forceCompleteUser">PROPAGATION_REQUIRED</prop>   
+			    <prop key="import*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>                 
+				<prop key="get*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
+				<prop key="is*">PROPAGATION_REQUIRED,+java.lang.Exception</prop> 
+                <prop key="launchTimeLimit">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="leaveToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="loadupLastAttempt">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="notify*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="processUserAnswers">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
 				<prop key="recalculate*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
 				<prop key="releaseFromCache">readOnly, PROPAGATION_REQUIRED,+java.lang.Exception</prop>
+                <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="set*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="store*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="unset*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="update*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
             </props>
         </property>
     </bean>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u -r5ebec80ccc488d5c09da8e9f648b718b02d0dee2 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 5ebec80ccc488d5c09da8e9f648b718b02d0dee2)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -98,22 +98,30 @@
 			</property>
 			<property name="transactionAttributes">
 				<props>
-					<prop key="create*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+            		<prop key="audit*">PROPAGATION_REQUIRED</prop>
+            		<prop key="buildGroupsMarkData">PROPAGATION_REQUIRED</prop>
+					<prop key="changeUserAttemptMark">PROPAGATION_REQUIRED,-McApplicationException</prop>
+					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-McApplicationException</prop>
 					<prop key="copy*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+					<prop key="create*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+					<prop key="existsSession">PROPAGATION_REQUIRED</prop>
+					<prop key="export*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+					<prop key="find*">PROPAGATION_REQUIRED</prop>
+					<prop key="forceCompleteUser">PROPAGATION_REQUIRED</prop>
+					<prop key="get*">PROPAGATION_REQUIRED</prop>
+					<prop key="import*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+					<prop key="is*">PROPAGATION_REQUIRED</prop>
+					<prop key="leaveToolSession">PROPAGATION_REQUIRED</prop>
+					<prop key="persistFile">PROPAGATION_REQUIRED,-McApplicationException</prop>
+					<prop key="prepareSessionDataSpreadsheet">PROPAGATION_REQUIRED</prop>
+					<prop key="recalculateUserAnswers">PROPAGATION_REQUIRED</prop>
+					<prop key="refreshQuestionContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
+                	<prop key="release*">PROPAGATION_REQUIRED</prop>
+					<prop key="remove*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+                	<prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
 					<prop key="save*">PROPAGATION_REQUIRED, -McApplicationException</prop>
 					<prop key="set*">PROPAGATION_REQUIRED,-McApplicationException</prop>
 					<prop key="update*">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="get*">PROPAGATION_REQUIRED, -MccpApplicationException</prop>
-					<prop key="remove*">PROPAGATION_REQUIRED,-McApplicationException</prop>
-                	<prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-					<prop key="persistFile">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="importToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="exportToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="import102ToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="setReflectiveData">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="setDefineLater">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="changeUserAttemptMark">PROPAGATION_REQUIRED,-McApplicationException</prop>
 				</props>
 			</property>
 	</bean>  
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r02ce40b60524aa33d326fbda824dcd43f566ab94 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 02ce40b60524aa33d326fbda824dcd43f566ab94)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -86,21 +86,24 @@
 			</property>
 			<property name="transactionAttributes">
 				<props>
+            		<prop key="audit*">PROPAGATION_REQUIRED</prop>
+					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="create*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="copy*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="save*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
-					<prop key="update*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="export*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="finishToolSession">PROPAGATION_REQUIRED, -QaApplicationException</prop>
+					<prop key="forceCompleteUser">PROPAGATION_REQUIRED</prop>
 					<prop key="get*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
+					<prop key="import*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="is*">PROPAGATION_REQUIRED</prop>
+					<prop key="leaveToolSession">PROPAGATION_REQUIRED</prop>
+                	<prop key="notifyTeachersOnResponseSubmit">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="remove*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="recalculateUserAnswers">PROPAGATION_REQUIRED,-QaApplicationException</prop>
                 	<prop key="resetDefineLater">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-                	<prop key="setDefineLater">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-                	<prop key="notifyTeachersOnResponseSubmit">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="importToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="exportToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="import102ToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="setReflectiveData">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="finishToolSession">PROPAGATION_REQUIRED, -QaApplicationException</prop>
+					<prop key="save*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
+					<prop key="set*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+					<prop key="update*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 				</props>
 			</property>
 	</bean>  
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r400c6f5c11c7d0001db120fd838bf820d2fb062a -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -9,22 +9,20 @@
 			<div class="row no-gutter">
 				<div class="col-xs-12">
 					<div class="panel panel-default">
-					<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1 }">
 						<div class="panel-heading">
 							<div class="panel-title">
-								<strong> 
-									<fmt:message key="label.question" />&nbsp;<c:out value="${questionEntry.key}" /> <c:out value="${items}"></c:out> 
-								</strong>
+								<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() !=1}"><c:out value="${questionEntry.key}" />.</c:if>  <c:out value="${questionEntry.value.name}" escapeXml="false" />
 							</div>
 						</div>
-						</c:if>
+
 						<div class="panel-body">
-							<div class="panel">
-								<c:out value="${questionEntry.value.question}" escapeXml="false" />
-							</div>
+							<c:if test="${not empty questionEntry.value.description}">
+								<div class="panel">
+									<c:out value="${questionEntry.value.description}" escapeXml="false" />
+								</div>
+							</c:if>
 						
 							<div class="answer-req">
-
 								<c:if test="${questionEntry.value.required}">
 									<span class="label label-danger pull-right"><fmt:message key="label.required" /></span>
 								</c:if> 
@@ -34,14 +32,13 @@
 									<strong><fmt:message key="label.words.required" />&nbsp;</strong><span id="words-required-${questionEntry.key}" class="badge"></span>
 								</button>
 								<div class="voffset5">&nbsp;</div>
-								
 								</c:if>
 
 							</div>
 
 							<c:choose>
 								<c:when test="${hasEditRight}">
-								<c:set var="placeholder"><fmt:message key="label.learning.yourAnswer" />...</c:set>
+									<c:set var="placeholder"><fmt:message key="label.learning.yourAnswer" />...</c:set>
 									<div data-sequence-id="${questionEntry.key}"
 										data-is-ckeditor="${generalLearnerFlowDTO.allowRichEditor}"
 										data-min-words-limit="${questionEntry.value.minWordsLimit}"
@@ -82,10 +79,8 @@
 
 <c:if test="${hasEditRight}">
 	<div class="right-buttons">
-		<button name="btnCombined"
-			type="button"
-			onclick="javascript:submitMethod('submitAnswersContent');"
-			class="btn btn-default pull-right voffset5">
+		<button name="btnCombined" type="button" class="btn btn-default pull-right voffset5"
+			onclick="javascript:submitMethod('submitAnswersContent');">
 			<fmt:message key="button.submitAllContent" />
 		</button>
 	</div>
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -rb89d86d22d3a9ae18e5a3e071542754a4f827c49 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision b89d86d22d3a9ae18e5a3e071542754a4f827c49)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -350,7 +350,7 @@
 								<c:if test="${generalLearnerFlowDTO.questions.size() != 1}">${status.count}.&nbsp;</c:if> 
 								<c:out value="${question.qbQuestion.name}" escapeXml="false" />
 							</div>
-							
+
 							<div class="panel-body">
 								<c:if test="${not empty question.qbQuestion.description}">
 									<div class="panel">
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r400c6f5c11c7d0001db120fd838bf820d2fb062a -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 400c6f5c11c7d0001db120fd838bf820d2fb062a)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -11,18 +11,19 @@
 		<div class="row no-gutter">
 			<div class="col-xs-12">
 				<div class="panel panel-default">
-				<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1 }">
 					<div class="panel-heading">
 						<div class="panel-title">
-							<strong> <fmt:message key="label.question" />&nbsp;<c:out value="${questionEntry.key}" />
-							</strong>
+							<c:if test="${generalLearnerFlowDTO.mapQuestionContentLearner.size() != 1}"><c:out value="${questionEntry.key}" />.&nbsp;</c:if> <c:out value="${questionEntry.value.name}" escapeXml="false" />
 						</div>
 					</div>
-				</c:if>	
+
 					<div class="panel-body">
-						<div class="panel">
-							<c:out value="${questionEntry.value.question}" escapeXml="false" />
-						</div>
+						<c:if test="${not empty questionEntry.value.description}">
+							<div class="panel">
+								<c:out value="${questionEntry.value.description}" escapeXml="false" />
+							</div>
+						</c:if>
+						
 						<div class="answer-req">
 							<c:if test="${questionEntry.value.required}">
 									<span class="label label-danger pull-right"><fmt:message key="label.required" /></span>
@@ -55,6 +56,10 @@
 						</div>
 
 						<input type="hidden" name="currentQuestionIndex" value="${questionEntry.key}" />
+					</div>
+				</div>
+			</div>
+		</div>
 	</c:if>
 </c:forEach>
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision 269c13324c6bb998631af858dc8091ad3102ef78)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -134,31 +134,32 @@
 		</property>
         <property name="transactionAttributes">
             <props>
-            	<prop key="addLike">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-            	<prop key="recalculate*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+            	<prop key="addLike">PROPAGATION_REQUIRED,-java.lang.Exception</prop> 
+            	<prop key="audit*">PROPAGATION_REQUIRED</prop>
+                <prop key="changeUserMark">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="copy*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="count*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>            
+                <prop key="export*">PROPAGATION_REQUIRED,+java.lang.Exception</prop> 
+                <prop key="finishToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="forceCompleteUser">PROPAGATION_REQUIRED</prop>
+                <prop key="get*">PROPAGATION_REQUIRED</prop>
+			    <prop key="import*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>  
+                <prop key="is*">PROPAGATION_REQUIRED</prop>
                 <prop key="launchTimeLimit">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="leaveToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="logAnswerAccess">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="populateItemsWithConfidenceLevels">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+            	<prop key="recalculate*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="recordItemScratched">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="recordVsaAnswer">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="changeUserMark">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="copyScratchesFromLeader">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="setScratchingFinished">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="setItemComplete">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="setItemVisible">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="logAnswerAccess">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="copyToolContent">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="leaveToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-                <prop key="finishToolSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-			    <prop key="importToolContent">PROPAGATION_REQUIRED,+java.lang.Exception</prop>                
-                <prop key="exportToolContent">PROPAGATION_REQUIRED,+java.lang.Exception</prop>                      
-				<prop key="import102ToolContent">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
-				<prop key="setReflectiveData">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
-				<prop key="release*">PROPAGATION_REQUIRED</prop>
+                <prop key="release*">PROPAGATION_REQUIRED</prop>
+                <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="set*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>                    
             </props>
         </property>
     </bean>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
===================================================================
diff -u -r0ac9fd6fe9f8c417393174e0ad1e68ef09ab33c7 -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 0ac9fd6fe9f8c417393174e0ad1e68ef09ab33c7)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -64,16 +64,17 @@
 		    while (entryIterator.hasNext()) {
 			Entry<Long, Set<Session>> entry = entryIterator.next();
 			Long toolSessionId = entry.getKey();
-			// if all learners left the activity, remove the obsolete mapping
+
 			Set<Session> sessionWebsockets = entry.getValue();
-			if (sessionWebsockets.isEmpty()) {
+			ScratchieSession toolSession = LearningWebsocketServer.getScratchieService()
+				.getScratchieSessionBySessionId(toolSessionId);
+			// if all learners left the activity or session is missing, remove the obsolete mapping
+			if (sessionWebsockets.isEmpty() || toolSession == null) {
 			    entryIterator.remove();
 			    LearningWebsocketServer.cache.remove(toolSessionId);
 			    continue;
 			}
 
-			ScratchieSession toolSession = LearningWebsocketServer.getScratchieService()
-				.getScratchieSessionBySessionId(toolSessionId);
 			boolean timeLimitUp = false;
 			boolean scratchingFinished = toolSession.isScratchingFinished();
 			// is Scratchie time limited?
@@ -127,6 +128,8 @@
 		} catch (IllegalStateException e) {
 		    // do nothing as server is probably shutting down and we could not obtain Hibernate session
 		} catch (Exception e) {
+		    //TODO remove this once NullPointerExceptions do not show anymore in logs
+		    e.printStackTrace();
 		    // error caught, but carry on
 		    log.error("Error in Scratchie worker thread", e);
 		} finally {