Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r029e69643ff0fb567d2d53ef9e63ba4bd035e50b -ra88211844dbfb8e302fc327caf6327c894cafbcf
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r029e69643ff0fb567d2d53ef9e63ba4bd035e50b -ra88211844dbfb8e302fc327caf6327c894cafbcf
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
===================================================================
diff -u -rb365bfb0ceb516dcf01316100cf218de71fb324e -ra88211844dbfb8e302fc327caf6327c894cafbcf
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision b365bfb0ceb516dcf01316100cf218de71fb324e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision a88211844dbfb8e302fc327caf6327c894cafbcf)
@@ -374,7 +374,16 @@
 		//bnools need to be included - so do as follows:
 		dto.applyGrouping = (_applyGrouping==null) ? false : _applyGrouping;
 		dto.runOffline = (_runOffline==null) ? false : _runOffline;
-		dto.defineLater = (_defineLater==null) ? false : _defineLater;
+		
+		if(isBranchingActivity())
+			if(_activityTypeID == GROUP_BRANCHING_ACTIVITY_TYPE)
+				dto.defineLater = _defineLater;
+			else
+				dto.defineLater = false;
+		else
+			dto.defineLater = (_defineLater==null) ? false : _defineLater;
+		
+		
 		if(_createDateTime){		dto.createDateTime		= _createDateTime;			}
 		if(_groupingSupportType){	dto.groupingSupportType = _groupingSupportType;		}
 		if(_readOnly){	dto.readOnly = _readOnly;	 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
===================================================================
diff -u -r029e69643ff0fb567d2d53ef9e63ba4bd035e50b -ra88211844dbfb8e302fc327caf6327c894cafbcf
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision 029e69643ff0fb567d2d53ef9e63ba4bd035e50b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision a88211844dbfb8e302fc327caf6327c894cafbcf)
@@ -89,7 +89,6 @@
 		if(_endXCoord) dto.endXCoord = _endXCoord;
 		if(_endYCoord) dto.endYCoord = _endYCoord;
 		if(_toolActivityUIID) dto.toolActivityUIID = _toolActivityUIID;
-		
 		if(_defaultBranch) dto.defaultActivityUIID = _defaultBranch.sequenceActivity.activityUIID;
 		
 		return dto;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r9aab591f71aa913ad9b848d8cd406728c171470b -ra88211844dbfb8e302fc327caf6327c894cafbcf
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 9aab591f71aa913ad9b848d8cd406728c171470b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision a88211844dbfb8e302fc327caf6327c894cafbcf)
@@ -381,7 +381,7 @@
 			showBranchProperties(branch);
 			
 			showGeneralControls(true, !branch.sequenceActivity.readOnly);
-			showBranchControls(true);
+			showBranchControls((Activity(cm.getCanvas().ddm.getActivityByUIID(branch.sequenceActivity.parentUIID)).activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE));
 			
 			showGeneralInfo(false);
 			showOptionalControls(false);
@@ -494,7 +494,8 @@
 			showAppliedGroupingControls(true, !ba.readOnly);
 			showGroupBasedBranchingControls(true, !ba.readOnly);
 			
-			_define_monitor_cb.selected = (ba.defineLater != null) ? ba.defineLater : false;
+			Debugger.log("defineLater: " + ba.defineLater, Debugger.CRITICAL, "showBranchingActivityProperties", "PropertyInspector");
+			//_define_monitor_cb.selected = (ba.defineLater != null) ? ba.defineLater : false;
 		}
 	
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r9aab591f71aa913ad9b848d8cd406728c171470b -ra88211844dbfb8e302fc327caf6327c894cafbcf
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 9aab591f71aa913ad9b848d8cd406728c171470b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision a88211844dbfb8e302fc327caf6327c894cafbcf)
@@ -513,7 +513,7 @@
 			numLearners_rdo.visible = false;
 			numGroups_rdo.visible = false;
 			
-			_group_naming_btn.visible = (numGroups_stp.value > 0) ? true : false;
+			_group_naming_btn.visible = true; //(numGroups_stp.value > 0) ? true : false;
 			
 			if(e != null) {
 				numGroups_lbl.enabled = e;
@@ -618,7 +618,7 @@
 			numLearners_stp.enabled = false;
 			
 			_group_naming_btn.enabled = (e != null) ? e : true;
-			_group_naming_btn.visible = (numRandomGroups_stp.value > 0) ? true : false;
+			_group_naming_btn.visible = true; // (numRandomGroups_stp.value > 0) ? true : false;
 		
 		}
 		
@@ -700,9 +700,6 @@
 			numGroups_stp.value = 0;
 			g.maxNumberOfGroups = 0;
 			
-			_group_naming_btn.visible = (numRandomGroups_stp.value > 0) ? true : false;
-			_define_monitor_cb.selected = false;
-			
 		}else{
 			g.maxNumberOfGroups = numGroups_stp.value;
 			
@@ -711,9 +708,6 @@
 			g.learnersPerGroups = 0;
 			g.numberOfGroups = 0;
 			
-			_group_naming_btn.visible = (numGroups_stp.value > 0) ? true : false;
-			_define_monitor_cb.selected = false;
-			
 		}
 				
 		setModified();
@@ -887,7 +881,7 @@
 			}
 			
 			_canvasModel.selectedItem.activity.toolActivityUIID = null;
-			_canvasModel.selectedItem.activity.defineLater = null;
+			//_canvasModel.selectedItem.activity.defineLater = null;
 			
 			showGroupBasedBranchingControls(true, !_canvasModel.selectedItem.activity.readOnly);
 			showAppliedGroupingControls(true, !_canvasModel.selectedItem.activity.readOnly);
@@ -899,7 +893,6 @@
 			showToolBasedBranchingControls(true, !_canvasModel.selectedItem.activity.readOnly);
 			
 			_canvasModel.selectedItem.activity.groupingUIID = null;
-			_canvasModel.selectedItem.activity.defineLater = null;
 			
 			showGroupBasedBranchingControls(false);
 			showAppliedGroupingControls(false);
@@ -910,7 +903,6 @@
 		} else {
 			_canvasModel.selectedItem.activity.groupingUIID = null;
 			_canvasModel.selectedItem.activity.toolActivityUIID = null;
-			_canvasModel.selectedItem.activity.defineLater = null;
 			
 			showToolBasedBranchingControls(false);
 			showGroupBasedBranchingControls(false);
@@ -1022,8 +1014,8 @@
 			return; 
 		}		
 		
-		if(_canvasModel.selectedItem.activity.defineLater != null)
-			_canvasModel.selectedItem.activity.defineLater = _define_monitor_cb.selected;
+		//if(_canvasModel.selectedItem.activity.defineLater != null)
+		//	_define_monitor_cb.selected = _canvasModel.selectedItem.activity.defineLater;
 
 		var ca = _canvasModel.selectedItem;
 		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID);
@@ -1034,7 +1026,7 @@
 			if(grouping.learnersPerGroups > 0)
 				_canvasModel.selectedItem.activity.defineLater = true;
 			
-			_define_monitor_cb.selected = (_canvasModel.selectedItem.activity.defineLater != null) ? _canvasModel.selectedItem.activity.defineLater : false;
+			_define_monitor_cb.selected = _canvasModel.selectedItem.activity.defineLater;
 			
 			_group_match_btn.visible = ((grouping.numberOfGroups > 0 || grouping.maxNumberOfGroups > 0) && !_define_monitor_cb.selected) ? v : false;
 			_define_monitor_cb.visible = (grouping.numberOfGroups > 0 || grouping.maxNumberOfGroups > 0 || grouping.learnersPerGroups > 0) ? v : false;
@@ -1157,7 +1149,7 @@
 	
 	public function onDefaultBranchSelect(evt:Object):Void {
 		if(_pi_defaultBranch_cb.selected) {
-			_canvasModel.activeView.activity.defaultBranch = BranchConnector(_canvasModel.selectedItem).branch; _pi_defaultBranch_cb.selected
+			_canvasModel.activeView.activity.defaultBranch = BranchConnector(_canvasModel.selectedItem).branch;
 			_pi_defaultBranch_cb.enabled = false;
 		}
 		
@@ -1166,11 +1158,8 @@
 	
 	public function onDefineMonitorSelect(evt:Object):Void {
 			
-		if(_define_monitor_cb.selected)
-			_canvasModel.selectedItem.activity.defineLater = _define_monitor_cb.selected;
-		else
-			_canvasModel.selectedItem.activity.defineLater = false;
-		
+		_canvasModel.selectedItem.activity.defineLater = _define_monitor_cb.selected;
+
 		var grouping:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.groupingUIID);
 		_group_match_btn.visible = ((grouping.numberOfGroups > 0 || grouping.maxNumberOfGroups > 0) && !_define_monitor_cb.selected) ? true : false;
 		
@@ -1190,7 +1179,6 @@
 			
 			_canvasModel.selectedItem.activity.defineLater = defineLater_chk.selected;
 			Debugger.log('_canvasModel.selectedItem.activity.defineLater:'+_canvasModel.selectedItem.activity.defineLater,Debugger.GEN,'click','PropertyInspector');
-		
 		}else if(tgt.indexOf("runOffline_chk") != -1){
 			
 			_canvasModel.selectedItem.activity.runOffline = runOffline_chk.selected;