Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rbadd2ddf48abc8af4a2b0f885e96b0ee966e0ffb -rfce9353d57740da2a73ac09e6357991b2c850e33
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rbadd2ddf48abc8af4a2b0f885e96b0ee966e0ffb -rfce9353d57740da2a73ac09e6357991b2c850e33
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
===================================================================
diff -u -r8499a7e0ba9d82c35d27fa14f41428003fe427ce -rfce9353d57740da2a73ac09e6357991b2c850e33
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision 8499a7e0ba9d82c35d27fa14f41428003fe427ce)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision fce9353d57740da2a73ac09e6357991b2c850e33)
@@ -251,8 +251,12 @@
 		return (_activityTypeID == OPTIONAL_ACTIVITY_TYPE);
 	}
 	
+	public function isOptionsWithSequencesActivity():Boolean {
+		return (_activityTypeID == OPTIONS_WITH_SEQUENCES_TYPE);
+	}
+	
 	public function isOptionalSequenceActivity(parent:Activity):Boolean {
-		return (this.isSequenceActivity() && parent.activityTypeID == OPTIONS_WITH_SEQUENCES_TYPE);
+		return (this.isSequenceActivity() && parent.isOptionsWithSequencesActivity());
 	}
 	
 	public function isParallelActivity():Boolean{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -re3f31032a79214a1a2d51cb28c89daaa7f9e01f1 -rfce9353d57740da2a73ac09e6357991b2c850e33
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision e3f31032a79214a1a2d51cb28c89daaa7f9e01f1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision fce9353d57740da2a73ac09e6357991b2c850e33)
@@ -22,10 +22,10 @@
  */
 
 import org.lamsfoundation.lams.common.*;
+import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.authoring.cv.*;
 import org.lamsfoundation.lams.authoring.br.BranchConnector;
 import org.lamsfoundation.lams.authoring.br.CanvasBranchView;
-import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.util.*;
 import org.lamsfoundation.lams.common.ui.*;
 import org.lamsfoundation.lams.common.dict.*;
@@ -598,50 +598,6 @@
 		return (transObj.out == null) ? activityUIID : getLastActivityUIID(transObj.out.toUIID);
 	}
 	
-	public function getDownstreamActivities(_class):Array {
-		var _activity;
-		var _activityUIID:Number = selectedItem.activity.activityUIID;
-		var tActivities:Array = new Array();
-		
-		if(_class == ToolActivity)
-			tActivities.addItem({label: "--Selection--", data: 0});	 // TODO: Label required
-		
-		while(_activityUIID != null) {
-			
-			var transObj:Object = getCanvas().ddm.getTransitionsForActivityUIID(_activityUIID);
-		
-			_activity = (transObj.into != null) ? _cv.ddm.getActivityByUIID(transObj.into.fromUIID) : null;
-			
-			if(_activity != null) {
-				if(_activity instanceof _class) {
-					if(_class == ToolActivity) tActivities.addItem({label: _activity.title, data: _activity.activityUIID});
-					else tActivities.addItem({label: _activity.title, data: _activity});
-				} else if(_activity instanceof ComplexActivity) {
-					if(!_activity.isOptionalActivity() && !_activity.isSequenceActivity())
-						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class);
-				}
-			}
-			
-			_activityUIID = _activity.activityUIID;
-		}
-
-		return tActivities;
-	}
-	
-	private function getActivitiesFromComplexByClass(complexUIID, tActs:Array, _class):Void {
-		var children:Array = getCanvas().ddm.getComplexActivityChildren(complexUIID);
-		
-		for(var i=0; i<children.length; i++) {
-			if(children[i] instanceof _class)
-				if(_class == ToolActivity) tActs.addItem({label: children[i].title, data: children[i].activityUIID});
-				else tActs.addItem({label: children[i].title, data: children[i]});
-			else if(children[i] instanceof ComplexActivity)
-				if(!children[i].isOptionalActivity() && !children[i].isSequenceActivity())
-					getActivitiesFromComplexByClass(children[i].activityUIID, tActs, _class);
-		}
-
-	}
-	
 	public function addActivityToConnection(ca:Object):Object{
 		var activity:Activity;
 		//check we have not added too many
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41 -rfce9353d57740da2a73ac09e6357991b2c850e33
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision fce9353d57740da2a73ac09e6357991b2c850e33)
@@ -109,6 +109,57 @@
 		
 	}
 	
+	public function getDownstreamActivities(_class, isBranching:Boolean):Array {
+		var _activity;
+		var _activityUIID:Number = selectedItem.activity.activityUIID;
+		var tActivities:Array = new Array();
+		
+		if(isBranching)
+			tActivities.addItem({label: "--Selection--", data: 0});	 // TODO: Label required
+		
+		while(_activityUIID != null) {
+			
+			var transObj:Object = getCanvas().ddm.getTransitionsForActivityUIID(_activityUIID);
+		
+			_activity = (transObj.into != null) ? _cv.ddm.getActivityByUIID(transObj.into.fromUIID) : getParentActivity(_activity);
+			
+			if(_activity != null) {
+				if(_activity instanceof _class) {
+					if(isBranching) tActivities.addItem({label: _activity.title, data: _activity.activityUIID});
+					else tActivities.addItem({label: _activity.title, data: _activity});
+				} else if(_activity instanceof ComplexActivity) {
+					if(!isBranching && !_activity.isOptionalActivity() && !_activity.isSequenceActivity())
+						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
+					else if(isBranching && !_activity.isOptionalActivity() && !_activity.isOptionsWithSequencesActivity())
+						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching);
+						
+				}
+			}
+			
+			_activityUIID = _activity.activityUIID;
+		}
+
+		return tActivities;
+	}
+	
+	private function getActivitiesFromComplexByClass(complexUIID, tActs:Array, _class, isBranching:Boolean):Void {
+		var children:Array = getCanvas().ddm.getComplexActivityChildren(complexUIID);
+		
+		for(var i=0; i<children.length; i++) {
+			if(children[i] instanceof _class) {
+				if(isBranching) tActs.addItem({label: children[i].title, data: children[i].activityUIID});
+				else tActs.addItem({label: children[i].title, data: children[i]});
+			} else if(children[i] instanceof ComplexActivity) {
+				if(!isBranching && !children[i].isOptionalActivity() && !children[i].isSequenceActivity()) {
+					getActivitiesFromComplexByClass(children[i].activityUIID, tActs, _class);
+				} else if(isBranching && !children[i].isOptionalActivity() && !children[i].isOptionsWithSequencesActivity()) {
+					getActivitiesFromComplexByClass(children[i].activityUIID, tActs, _class);
+				}
+			}
+		}
+
+	}
+	
 	public function addToBranchingQueue(a:CanvasBranchView):Void {
 		Debugger.log("adding to branching queue: " + a, Debugger.CRITICAL, "addToBranchingQueue", "CanvasSuperModel");
 		
@@ -611,6 +662,10 @@
 	public function isActiveView(view:Object):Boolean {
 		return (activeView == view);
 	}
+	
+	public function getParentActivity(act):Activity {
+		return (Activity(act).parentUIID != null) ? _cv.ddm.getActivityByUIID(Activity(act).parentUIID) : null;
+	}
 	
 	public function findParent(a:Activity, b:Activity):Boolean {
 		if(a.activityUIID == b.activityUIID)
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -rb18810be6bdfea83a5c74ce79324d570ea98c8b0 -rfce9353d57740da2a73ac09e6357991b2c850e33
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision b18810be6bdfea83a5c74ce79324d570ea98c8b0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision fce9353d57740da2a73ac09e6357991b2c850e33)
@@ -134,6 +134,79 @@
 		hideAllSteppers(false);
 		
 	}
+	
+	public function setupLabels(){
+		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b>"
+		
+		gateType_lbl.text = Dictionary.getValue('trans_dlg_gatetypecmb');
+		branchType_lbl.text = Dictionary.getValue("pi_branch_type");
+		branchToolActs_lbl.text = Dictionary.getValue("pi_branch_tool_acts_lbl");
+		
+		days_lbl.text = Dictionary.getValue('pi_days');
+		hours_lbl.text = Dictionary.getValue('pi_hours');
+		mins_lbl.text = Dictionary.getValue('pi_mins');
+		hoursEnd_lbl.text = Dictionary.getValue('pi_hours');
+		minsEnd_lbl.text = Dictionary.getValue('pi_mins');
+		startOffset_lbl.text = Dictionary.getValue('pi_start_offset');
+		endOffset_lbl.text = Dictionary.getValue('pi_end_offset');
+		
+		groupType_lbl.text = Dictionary.getValue('pi_group_type');
+		numGroups_lbl.text = Dictionary.getValue('pi_num_groups');
+		numLearners_lbl.text = Dictionary.getValue('pi_num_learners');
+		
+		//Properties tab
+		title_lbl.text = Dictionary.getValue('pi_lbl_title');
+		desc_lbl.text = Dictionary.getValue('pi_lbl_desc');
+		grouping_lbl.text = Dictionary.getValue('pi_lbl_group');
+		currentGrouping_lbl.text = Dictionary.getValue('pi_lbl_currentgroup');
+		defineLater_chk.label = Dictionary.getValue('pi_definelater');
+		runOffline_chk.label = Dictionary.getValue('pi_runoffline');
+				
+		//Complex Activity
+		//min_lbl.text = Dictionary.getValue('pi_min_act');
+		//max_lbl.text = Dictionary.getValue('pi_max_act');
+		
+		noSeqAct_lbl.text = Dictionary.getValue('pi_no_seq_act');
+		
+		_group_match_btn.label = Dictionary.getValue('pi_mapping_btn_lbl');
+		_group_naming_btn.label = Dictionary.getValue('pi_group_naming_btn_lbl');
+		_tool_output_match_btn.label = Dictionary.getValue('pi_mapping_btn_lbl');
+		_conditions_setup_btn.label = Dictionary.getValue('pi_condmatch_btn_lbl');
+
+		_define_monitor_cb.label = Dictionary.getValue('pi_define_monitor_cb_lbl');
+
+		// Branch 
+		_pi_defaultBranch_cb.label = Dictionary.getValue("pi_defaultBranch_cb_lbl");
+		
+		//populate the synch type combo:
+		gateType_cmb.dataProvider = Activity.getGateActivityTypes();
+		branchType_cmb.dataProvider = Activity.getBranchingActivityTypes();
+		groupType_cmb.dataProvider = Grouping.getGroupingTypesDataProvider();
+		
+		//Call to apply style to all the labels and input fields
+		setStyles();
+		setButtonSizes();
+		
+		//fire event to say we have loaded
+		delete this.onEnterFrame; 
+		
+		//hide all the controls at startup
+		delimitLine._visible = false;
+		_group_match_btn.visible = false;
+		
+		hideAllSteppers(false);
+		
+		showGroupingControls(false);
+		showGeneralControls(false);
+		showOptionalControls(false);
+		showToolActivityControls(false);
+		showGateControls(false);
+		showBranchingControls(false);
+		showAppliedGroupingControls(false);
+		showGeneralInfo(true);
+		
+		dispatchEvent({type:'load',target:this});
+	}
 	
 	public function localOnRelease():Void{
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -re3f31032a79214a1a2d51cb28c89daaa7f9e01f1 -rfce9353d57740da2a73ac09e6357991b2c850e33
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision e3f31032a79214a1a2d51cb28c89daaa7f9e01f1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision fce9353d57740da2a73ac09e6357991b2c850e33)
@@ -161,80 +161,6 @@
 		
 		_dictionary = Dictionary.getInstance();
 		
-	}
-
-	
-	public function setupLabels(){
-		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b>"
-		
-		gateType_lbl.text = Dictionary.getValue('trans_dlg_gatetypecmb');
-		branchType_lbl.text = Dictionary.getValue("pi_branch_type");
-		branchToolActs_lbl.text = Dictionary.getValue("pi_branch_tool_acts_lbl");
-		
-		days_lbl.text = Dictionary.getValue('pi_days');
-		hours_lbl.text = Dictionary.getValue('pi_hours');
-		mins_lbl.text = Dictionary.getValue('pi_mins');
-		hoursEnd_lbl.text = Dictionary.getValue('pi_hours');
-		minsEnd_lbl.text = Dictionary.getValue('pi_mins');
-		startOffset_lbl.text = Dictionary.getValue('pi_start_offset');
-		endOffset_lbl.text = Dictionary.getValue('pi_end_offset');
-		
-		groupType_lbl.text = Dictionary.getValue('pi_group_type');
-		numGroups_lbl.text = Dictionary.getValue('pi_num_groups');
-		numLearners_lbl.text = Dictionary.getValue('pi_num_learners');
-		
-		//Properties tab
-		title_lbl.text = Dictionary.getValue('pi_lbl_title');
-		desc_lbl.text = Dictionary.getValue('pi_lbl_desc');
-		grouping_lbl.text = Dictionary.getValue('pi_lbl_group');
-		currentGrouping_lbl.text = Dictionary.getValue('pi_lbl_currentgroup');
-		defineLater_chk.label = Dictionary.getValue('pi_definelater');
-		runOffline_chk.label = Dictionary.getValue('pi_runoffline');
-				
-		//Complex Activity
-		//min_lbl.text = Dictionary.getValue('pi_min_act');
-		//max_lbl.text = Dictionary.getValue('pi_max_act');
-		
-		noSeqAct_lbl.text = Dictionary.getValue('pi_no_seq_act');
-		
-		_group_match_btn.label = Dictionary.getValue('pi_mapping_btn_lbl');
-		_group_naming_btn.label = Dictionary.getValue('pi_group_naming_btn_lbl');
-		_tool_output_match_btn.label = Dictionary.getValue('pi_mapping_btn_lbl');
-		_conditions_setup_btn.label = Dictionary.getValue('pi_condmatch_btn_lbl');
-
-		_define_monitor_cb.label = Dictionary.getValue('pi_define_monitor_cb_lbl');
-
-		// Branch 
-		_pi_defaultBranch_cb.label = Dictionary.getValue("pi_defaultBranch_cb_lbl");
-		
-		//populate the synch type combo:
-		gateType_cmb.dataProvider = Activity.getGateActivityTypes();
-		branchType_cmb.dataProvider = Activity.getBranchingActivityTypes();
-		groupType_cmb.dataProvider = Grouping.getGroupingTypesDataProvider();
-		
-		//Call to apply style to all the labels and input fields
-		setStyles();
-		setButtonSizes();
-		
-		//fire event to say we have loaded
-		delete this.onEnterFrame; 
-		
-		//hide all the controls at startup
-		delimitLine._visible = false;
-		_group_match_btn.visible = false;
-		
-		hideAllSteppers(false);
-		
-		showGroupingControls(false);
-		showGeneralControls(false);
-		showOptionalControls(false);
-		showToolActivityControls(false);
-		showGateControls(false);
-		showBranchingControls(false);
-		showAppliedGroupingControls(false);
-		showGeneralInfo(true);
-		
-		dispatchEvent({type:'load',target:this});
 	}
 	
 	private function setButtonSizes():Void {
@@ -482,7 +408,7 @@
 			
 			if(toolActs_cmb.visible) {
 				
-				toolActs_cmb.dataProvider = _canvasModel.getDownstreamActivities(ToolActivity);
+				toolActs_cmb.dataProvider = _canvasModel.getDownstreamActivities(ToolActivity, true);
 				
 				if(_canvasModel.selectedItem.activity.toolActivityUIID != null) {
 					var dp = toolActs_cmb.dataProvider;
@@ -807,7 +733,7 @@
 	}
 	
 	private function getGroupingActivitiesDP(){
-		var gActs:Array = _canvasModel.getDownstreamActivities(GroupingActivity);
+		var gActs:Array = _canvasModel.getDownstreamActivities(GroupingActivity, false);
 		Debugger.log("grouping acts len: " + gActs.length, Debugger.CRITICAL, "getGroupingActivitiesDP", "PIC");
 		
 		var gActsDP = new Array();
@@ -844,8 +770,6 @@
 		collapse_mc.redraw(true);
     }
 	
-	
-	
 	/**
 	 * Get the CSSStyleDeclaration objects for each component and applies them
 	 * directly to the instanced
@@ -976,7 +900,7 @@
 			showAppliedGroupingControls(false);
 		
 			if(toolActs_cmb.visible) {
-				toolActs_cmb.dataProvider = _canvasModel.getDownstreamActivities(ToolActivity);
+				toolActs_cmb.dataProvider = _canvasModel.getDownstreamActivities(ToolActivity, true);
 				for(var i=0; i < toolActs_cmb.dataProvider.length; i++)
 					selectToolActivityItem(i, toolActs_cmb.dataProvider[i].data);
 			}