Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r49867f4335115e9ead65e6911111410a6da5af1c -r961e65c76e64f2fe8ed146302e3818daac94890d
Binary files differ
Index: lams_build/lib/lams/lams-monitoring.jar
===================================================================
diff -u -r6cbd4eddf683da44fcbf3faed4ae3fe10e8336b8 -r961e65c76e64f2fe8ed146302e3818daac94890d
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -ref2417616a93e7d6f1eaee601fd78455a90564d6 -r961e65c76e64f2fe8ed146302e3818daac94890d
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java
===================================================================
diff -u -rc2a96caab480d04c02dc7a90e719fc0bb9af6a50 -r961e65c76e64f2fe8ed146302e3818daac94890d
--- lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java	(.../LessonManagerSoapBindingImpl.java)	(revision c2a96caab480d04c02dc7a90e719fc0bb9af6a50)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java	(.../LessonManagerSoapBindingImpl.java)	(revision 961e65c76e64f2fe8ed146302e3818daac94890d)
@@ -72,7 +72,7 @@
 					countryIsoCode, langIsoCode, null);
 			// 1. init lesson
 			Lesson lesson = monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, orgMap
-					.getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV);
+					.getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV, Boolean.FALSE, Boolean.FALSE);
 			// 2. create lessonClass for lesson
 			createLessonClass(lesson, orgMap.getOrganisation(), userMap.getUser());
 			// 3. start lesson
@@ -94,7 +94,7 @@
 					countryIsoCode, langIsoCode, null);
 			// 1. init lesson
 			Lesson lesson = monitoringService.initializeLesson(title, desc,  Boolean.TRUE, ldId, orgMap
-					.getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV);
+					.getOrganisation().getOrganisationId(), userMap.getUser().getUserId(), customCSV, Boolean.FALSE, Boolean.FALSE);
 			// 2. create lessonClass for lesson
 			createLessonClass(lesson, orgMap.getOrganisation(), userMap.getUser());
 			// 3. schedule lesson
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java
===================================================================
diff -u -r6008e13a4cc3e08a3350be02c35a22eb6ee5a9c1 -r961e65c76e64f2fe8ed146302e3818daac94890d
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java	(.../LessonJoinServlet.java)	(revision 6008e13a4cc3e08a3350be02c35a22eb6ee5a9c1)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java	(.../LessonJoinServlet.java)	(revision 961e65c76e64f2fe8ed146302e3818daac94890d)
@@ -249,6 +249,8 @@
 		String lessonName;
 		String lessonDescription;
 		Boolean learnerExportAvailable;
+		Boolean learnerPresenceAvailable;
+		Boolean learnerImAvailable;
 		Integer ownerUserId;
 		Organisation org = (Organisation)userService.findById(Organisation.class, orgId);
 		String learnerGroupName;
@@ -263,6 +265,8 @@
 			lessonName = incrementLessonName(l.getLessonName());
 			lessonDescription = l.getLessonDescription();
 			learnerExportAvailable = l.getLearnerExportAvailable();
+			learnerPresenceAvailable = l.getLearnerPresenceAvailable();
+			learnerImAvailable = l.getLearnerImAvailable();
 			ownerUserId = l.getUser().getUserId();
 			learnerGroupName = l.getLessonClass().getLearnersGroup().getGroupName();
 			staffGroupName = l.getLessonClass().getStaffGroup().getGroupName();
@@ -273,14 +277,16 @@
 			lessonName = ld.getTitle();
 			lessonDescription = ld.getDescription();
 			learnerExportAvailable = true;
+			learnerPresenceAvailable = false;
+			learnerImAvailable = false;
 			ownerUserId = ld.getUser().getUserId();
 			learnerGroupName = org.getName() + " Learners";
 			staffGroupName = org.getName() + " Staff";
 			Vector userDTOs = userService.getUsersFromOrganisationByRole(orgId, Role.MONITOR, false);
 			staffList = getUsersFromDTOs(userDTOs);
 		}
 		Lesson lesson = monitoringService.initializeLesson(lessonName, lessonDescription, learnerExportAvailable, 
-				ldId, orgId, ownerUserId, null);
+				ldId, orgId, ownerUserId, null, learnerPresenceAvailable, learnerImAvailable);
 		monitoringService.createLessonClassForLesson(lesson.getLessonId().longValue(), org, 
 				learnerGroupName, learnerList, staffGroupName, staffList, ownerUserId);
 		monitoringService.startLesson(lesson.getLessonId().longValue(), ownerUserId);
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
diff -u -rc2a96caab480d04c02dc7a90e719fc0bb9af6a50 -r961e65c76e64f2fe8ed146302e3818daac94890d
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(.../LessonManagerServlet.java)	(revision c2a96caab480d04c02dc7a90e719fc0bb9af6a50)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(.../LessonManagerServlet.java)	(revision 961e65c76e64f2fe8ed146302e3818daac94890d)
@@ -288,7 +288,7 @@
 			Lesson lesson = monitoringService.initializeLesson(title, desc, Boolean.TRUE, ldId, 
 							orgMap.getOrganisation().getOrganisationId(), 
 							userMap.getUser().getUserId(),
-							customCSV);
+							customCSV, Boolean.FALSE, Boolean.FALSE);
 			// 2. create lessonClass for lesson
 			createLessonClass(lesson, orgMap.getOrganisation(), userMap
 					.getUser());
@@ -319,7 +319,7 @@
 			Lesson lesson = monitoringService
 					.initializeLesson(title, desc, Boolean.TRUE, ldId, orgMap
 							.getOrganisation().getOrganisationId(), userMap
-							.getUser().getUserId(), customCSV);
+							.getUser().getUserId(), customCSV, false, false);
 			// 2. create lessonClass for lesson
 			createLessonClass(lesson, orgMap.getOrganisation(), userMap
 					.getUser());
@@ -530,7 +530,7 @@
 					serverMap, userMap, courseId, countryIsoCode, langIsoCode, null);
 			// 1. init lesson
 			Lesson lesson = monitoringService
-					.initializeLessonForPreview(title, desc, ldId, userMap.getUser().getUserId(), customCSV);
+					.initializeLessonForPreview(title, desc, ldId, userMap.getUser().getUserId(), customCSV, false, false);
 			// 2. create lessonClass for lesson
 			monitoringService.createPreviewClassForLesson(userMap.getUser().getUserId(), lesson.getLessonId());
 			
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java
===================================================================
diff -u -ra7c8316bc75e0f8bc56ff4e890cdf59e15b14d9f -r961e65c76e64f2fe8ed146302e3818daac94890d
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision a7c8316bc75e0f8bc56ff4e890cdf59e15b14d9f)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision 961e65c76e64f2fe8ed146302e3818daac94890d)
@@ -163,7 +163,9 @@
                                                                TEST_LEARNING_DESIGN_ID,
                                                                null,
                                                                testUser.getUserId(),
-                                                               null);
+                                                               null,
+                                                               false,
+                                                               false);
         TEST_LESSON_ID=testLesson.getLessonId();
         Lesson createdLesson = lessonDao.getLesson(TEST_LESSON_ID);
         assertNotNull(createdLesson);
@@ -340,7 +342,7 @@
 
 	private Lesson startLesson(String testName, String testDesc) {
 		try {
-	        Lesson previewLesson = monitoringService.initializeLessonForPreview(testName,testDesc,TEST_LEARNING_DESIGN_SURVEY_ONLY_ID,TEST_USER_ID, null);
+	        Lesson previewLesson = monitoringService.initializeLessonForPreview(testName,testDesc,TEST_LEARNING_DESIGN_SURVEY_ONLY_ID,TEST_USER_ID, null, false, false);
 	        assertNotNull("Lesson created",previewLesson);
 			assertNotNull("Lesson has been saved - an id exists", previewLesson.getLessonId());