Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rba18cd74878b427e043766eddab093b34c75a8b5 -rcd33f92df2c46dfe2e817281d501e179a6094637
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rba18cd74878b427e043766eddab093b34c75a8b5 -rcd33f92df2c46dfe2e817281d501e179a6094637
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -142,6 +142,7 @@
 	
 	public function set defaultBranch(a:Branch) {
 		_defaultBranch = a;
+		_firstActivityUIID = SequenceActivity(a.sequenceActivity).activityUIID;
 	}
 	
 	public function get defaultBranch():Branch {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	(.../ComplexActivity.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	(.../ComplexActivity.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -22,6 +22,7 @@
  */
 
 import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.common.util.StringUtils;
 /*
 * This class represents all the complex activity types.  they are not much different, so we can handle them in one class.
 * For reference these are the activity types
@@ -40,13 +41,13 @@
 	private var _minOptions:Number;
 	private var _optionsInstructions:String;
 	
+	private var _firstActivityUIID:Number;
 	
-	
 	function ComplexActivity(activityUIID:Number){
 		super(activityUIID);
+		_firstActivityUIID = null;
 	}
 	
-	
 	/**
 	 * Creates a complex activity from a dto... which is nice
 	 * @usage   
@@ -61,6 +62,9 @@
 			//TODO: This is missing in the Library packet - tell mai.
 			_optionsInstructions = dto.optionsInstructions;
 		}
+		
+		if(StringUtils.isWDDXNull(dto.defaultActivityUIID)) _firstActivityUIID = null;
+		else _firstActivityUIID = dto.defaultActivityUIID;
 	}
 	
 	/**
@@ -148,12 +152,14 @@
 	public function get optionsInstructions ():String {
 		return _optionsInstructions;
 	}
-
 	
+	public function get firstActivityUIID():Number{
+		return _firstActivityUIID;
+	}
 	
+	public function set firstActivityUIID(a:Number):Void{
+		_firstActivityUIID = a;
+	}
 
-
-	
-
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -268,12 +268,12 @@
 	 * @param   branch 
 	 * @return  
 	 */
-	public function addBranchMapping(entry:GroupBranchActivityEntry):Boolean{
+	public function addBranchMapping(entry):Boolean{
 		//dispatch an event to show the design has changed
 		dispatchEvent({type:'ddmBeforeUpdate',target:this});
 	
 		Debugger.log('Branch Mapping entry:' + entry.entryUIID,4,'addBranchMapping','DesignDataModel');
-		_branchMappings.put(entry.entryUIID,entry);
+		_branchMappings.put(entry.entryUIID, entry);
 		
 		dispatchEvent({type:'ddmUpdate',target:this});
 		
@@ -904,6 +904,24 @@
 		}
 	}
 	
+	public function getBranchMappingsByActivityUIIDAndType(activityUIID:Number):Object {
+		var bMappings:Array = _branchMappings.values();
+		var myMappings:Object = new Object();
+		myMappings.groupBased = new Array();
+		myMappings.toolBased = new Array();
+		myMappings.uncategorised = new Array();
+		
+		for(var i=0; i<bMappings.length; i++) {
+			if(bMappings[i] instanceof GroupBranchActivityEntry)	
+					myMappings.groupBased.push(bMappings[i]);
+			else if(bMappings[i] instanceof ToolOutputBranchActivityEntry)
+				myMappings.toolBased.push(bMappings[i]);
+			else 
+				myMappings.uncategorised.push(bMappings[i]);
+		}
+		
+		return myMappings;
+	}
 	
 	/**
 	 * Retrieves all children of a complexy activity
@@ -992,13 +1010,18 @@
 				}
 			}
 		}
+		
 		branchObj.myBranches = myBranches;
 		branchObj.target = target;
 		branchObj.sequence = sequence;
 		branchObj.hub = hub;
 		return branchObj;
 	}
 	
+	public function getAllConditions():Array {
+		return _outputConditions.values();
+	}
+	
 	//Getters and setters for the properties
 	public function get objectType():String{
 		return _objectType;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
===================================================================
diff -u -r94869995ad20ccd5abbbf9c137934e562110376d -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 94869995ad20ccd5abbbf9c137934e562110376d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -22,7 +22,6 @@
  */
 
 import org.lamsfoundation.lams.authoring.*;
-import org.lamsfoundation.lams.common.util.StringUtils;
 import org.lamsfoundation.lams.common.Config;
 
 /*
@@ -37,15 +36,11 @@
 */
 class SequenceActivity extends ComplexActivity {
 	
-	
-	private var _firstActivityUIID:Number;
-	
 	private var _empty:Boolean;
 	
 	function SequenceActivity(activityUIID:Number){
 		super(activityUIID);
 		_activityTypeID = SEQUENCE_ACTIVITY_TYPE;
-		_firstActivityUIID = null;
 		_empty = true;
 	}
 	
@@ -57,8 +52,6 @@
 	 */
 	public function populateFromDTO(dto:Object){
 		super.populateFromDTO(dto);
-		if(StringUtils.isWDDXNull(dto.defaultActivityUIID)) _firstActivityUIID = null;
-		else _firstActivityUIID = dto.defaultActivityUIID;
 	}
 	
 	/**
@@ -87,15 +80,7 @@
 		sa.populateFromDTO(dto);
 		return sa;
 	}
-
-	public function get firstActivityUIID():Number{
-		return _firstActivityUIID;
-	}
 	
-	public function set firstActivityUIID(a:Number):Void{
-		_firstActivityUIID = a;
-	}
-	
 	public function set empty(b:Boolean):Void{
 		_empty = b;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as
===================================================================
diff -u -r94869995ad20ccd5abbbf9c137934e562110376d -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as	(.../ToolOutputBranchActivityEntry.as)	(revision 94869995ad20ccd5abbbf9c137934e562110376d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as	(.../ToolOutputBranchActivityEntry.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -33,9 +33,12 @@
 	private var _condition:ToolOutputCondition;
 	
 	function ToolOutputBranchActivityEntry(entryID:Number, entryUIID:Number, condition:ToolOutputCondition, sequenceActivity:SequenceActivity, branchingActivity:BranchingActivity){
-		super(entryID, entryUIID, sequenceActivity, branchingActivity);
+		this.entryID = entryID;
+		this.entryUIID = entryUIID;
+		this.sequenceActivity = sequenceActivity;
+		this.branchingActivity = branchingActivity;
 		
-		_condition = condition;
+		this.condition = condition;
 	}
 
 	public function toData():Object {
@@ -46,7 +49,7 @@
 		if(this.sequenceActivity) dto.sequenceActivityUIID = this.sequenceActivity.activityUIID;
 		if(this.branchingActivity) dto.branchingActivityUIID = this.branchingActivity.activityUIID;
 		
-		if(this.condition) dto = _condition.addConditionData(dto);
+		if(this.condition) dto.condition = _condition.toData(dto);
 		
 		return dto;
 	}
@@ -58,5 +61,9 @@
 	public function set condition(a:ToolOutputCondition):Void {
 		_condition = a;
 	}
+	
+	public function get displayName():String {
+		return _condition.displayName;
+	}
 	
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -21,7 +21,8 @@
  * ************************************************************************
  */
 
-import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.common.Config;
 
 /**
  *
@@ -104,15 +105,20 @@
 		_exactMatchValue = dto.exactMatchValue;
 	}
 	
-	public function addConditionData(dto:Object):Object {
+	public function toData():Object {
+		var dto:Object = new Object();
+		
+		if(_conditionID) dto.conditionID = conditionID;
+		if(_conditionUIID) dto.conditionUIID = _conditionUIID;
 		
 		if(_orderID) dto.orderID = _orderID;
 		if(_name) dto.name = _name;
 		if(_display_name) dto.displayName = _display_name;
 		if(_type) dto.type = _type;
-		if(_startValue) dto.startValue = _startValue;
-		if(_endValue) dto.endValue = _endValue;
-		if(_exactMatchValue) dto.exactMatchValue = _exactMatchValue;
+		
+		dto.startValue = (_startValue) ? _startValue : Config.STRING_NULL_VALUE;
+		dto.endValue = (_endValue)  ? _endValue : Config.STRING_NULL_VALUE;
+		dto.exactMatchValue = (_exactMatchValue) ? _exactMatchValue : Config.STRING_NULL_VALUE;
 		
 		return dto;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -425,6 +425,10 @@
 		var cbv = CanvasBranchView(this);
 		var cbc = getController();
 		
+		if(activity.defaultBranch == null) {
+			activity.defaultBranch = b;
+		}
+		
 		if(b.direction == BranchConnector.DIR_FROM_START) b.sequenceActivity.firstActivityUIID = b.targetUIID;
 		var newBranch_mc:MovieClip = branchLayer.createChildAtDepth("BranchConnector",DepthManager.kTop,{_branch:b,_canvasController:cbc,_canvasBranchView:cbv});
 		cm.branchesDisplayed.put(b.branchUIID,newBranch_mc);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	(.../ConditionMatchingDialog.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	(.../ConditionMatchingDialog.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -117,20 +117,21 @@
 		match_dgd.addColumn(column_sequence);
 		match_dgd.addColumn(column_condition);
 		
-		var mappings = app.getCanvas().ddm.branchMappings.values();
+		var mappings:Array = app.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(_branchingActivity.activityUIID).toolBased;
 		
-		for(var m in mappings) {
-			if(m instanceof ToolOutputBranchActivityEntry) {
-				match_dgd.addItem(mappings[m]);
-				removeCondition(mappings[m].condition);
-			}
+		Debugger.log("Loading Lists: mappings length: " + mappings.length, Debugger.CRITICAL, "loadLists", "ConditionMatchingDialog");
+		
+		for(var i=0; i < mappings.length; i++) {
+			match_dgd.addItem(mappings[i]);
+			removeCondition(mappings[i].condition);
 		}
+		
 	}
 	
 	private function removeCondition(c:ToolOutputCondition) {
 		var indexList:Array = new Array();
 		
-		for(var i=0; i<conditions_lst.rowCount; i++) {
+		for(var i=0; i<conditions_lst.length; i++) {
 			var item = conditions_lst.getItemAt(i);
 			if(item.conditionUIID == c.conditionUIID) { conditions_lst.removeItemAt(i); return; }
 		}
@@ -167,11 +168,14 @@
     }
 	
 	private function cleanupUnmappedConditions(){
-        for(var i=0; i < conditions_lst.length; i++) {
+        Debugger.log("clearing all unmapped conditions: " + conditions_lst.length, Debugger.CRITICAL, "cleanupUnmappedConditions", "ConditionMatchingDialog");
+		
+		for(var i=0; i < conditions_lst.length; i++) {
 			setupMatch(conditions_lst.getItemAt(i), _branchingActivity.defaultBranch);
 		}
 		
 		conditions_lst.removeAll();
+		app.getCanvas().ddm.conditions.clear();
 		
 		close();
 	}
@@ -208,7 +212,7 @@
 			
 			
 		} else {
-			LFMessage.showMessageAlert("No groups selected");
+			LFMessage.showMessageAlert("No condition selected");
 		}
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as	(.../GroupMatchingDialog.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as	(.../GroupMatchingDialog.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -115,13 +115,13 @@
 		match_dgd.addColumn(column_sequence);
 		match_dgd.addColumn(column_name);
 		
-		var mappings = app.getCanvas().ddm.branchMappings.values();
+		var mappings:Array = app.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(_branchingActivity.activityUIID).groupBased;
 		
-		for(var m in mappings) {
-			if(m instanceof GroupBranchActivityEntry) {
-				match_dgd.addItem(mappings[m]);
-				removeGroup(mappings[m].group);
-			}
+		Debugger.log("Loading Lists: mappings length: " + mappings.length, Debugger.CRITICAL, "loadLists", "GroupMatchingDialog");
+		
+		for(var i=0; i< mappings.length; i++) {
+			match_dgd.addItem(mappings[i]);
+			removeGroup(mappings[i].group);
 		}
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -24,6 +24,7 @@
 import org.lamsfoundation.lams.authoring.br.*;
 import org.lamsfoundation.lams.authoring.ToolOutputDefinition;
 import org.lamsfoundation.lams.authoring.ToolOutputCondition;
+import org.lamsfoundation.lams.authoring.BranchingActivity;
 import org.lamsfoundation.lams.authoring.Application;
 
 import org.lamsfoundation.lams.common.Dialog;
@@ -63,7 +64,6 @@
 	private var remove_item_btn:Button;
 	private var clear_all_btn:Button;
 	
-	private var _output_type_lbl:Label;
 	private var _condition_range_lbl:Label;
 	
 	private var _bgpanel:MovieClip;       //The underlaying panel base
@@ -78,7 +78,9 @@
     private var xCancelOffset:Number;
     private var yCancelOffset:Number;
 	
-	private var _itemCount:Number;
+	private var _itemCount:Number;
+	
+	private var _branchingActivity:BranchingActivity;
 
     //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
@@ -156,7 +158,6 @@
 	
 	private function setLabels(){
 		_condition_range_lbl.text = "Range:";
-		_output_type_lbl.text = "Output Type:";
 		
 		//Set the text for buttons
         close_btn.label = Dictionary.getValue('al_done');
@@ -191,7 +192,6 @@
         //Apply label style 
         styleObj = themeManager.getStyleObject('label');
 		_condition_range_lbl.setStyle('styleName', styleObj);
-		_output_type_lbl.setStyle('styleName', styleObj);
 		
 		styleObj = themeManager.getStyleObject('picombo');
 		_toolOutputDefin_cmb.setStyle('styleName', styleObj);
@@ -223,16 +223,27 @@
 	private function initSetup():Void {
 		delete this.onEnterFrame;
 		
-		// get branch conditions by branch activity uiid from ddm
+		var branches:Array = app.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(_branchingActivity.activityUIID).toolBased;
 		
-		// selected definition and add items to list that already exist in ddm for this matchup
+		for(var i=0; i<branches.length; i++) {
+			if(i==0) setDefinition(branches[i].condition.name);
+			addCondition(branches[i].condition);
+			itemChanged(null);
+		}
 		
-		// else no items do normal startup
-		itemChanged();
+		if(branches.length <= 0) itemChanged(true);
 		
 		this._visible = true;
 	}
 	
+	private function setDefinition(name:String):Void {
+		var items:Array = _toolOutputDefin_cmb.dataProvider;
+		
+		for(var i=0; i < items.length; i++)
+			if(items[i].name == name) 
+				_toolOutputDefin_cmb.selectedIndex = i;
+	}
+	
 	private function addButton_onPress():Void {
 		addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), "unnamed", _selectedDefinition, _start_value_stp.value, _end_value_stp.value));
 	}
@@ -256,8 +267,6 @@
 	 */
 	
 	private function addCondition(condition:ToolOutputCondition):Void {
-		if(_condition_item_dgd.getItemAt(0).data == null)
-			_condition_item_dgd.removeItemAt(0);
 		
 		switch(condition.type) {
 			case ToolOutputDefinition.LONG :
@@ -283,11 +292,7 @@
 	}
 	
 	private function removeAllItems():Void {
-		for(var i=0; i<_condition_item_dgd.length; i++) {
-			var item = _condition_item_dgd.getItemAt(i);
-			app.getCanvas().ddm.removeOutputCondition(item.conditionUIID);
-		}
-		
+		app.getCanvas().ddm.conditions.clear();
 		_condition_item_dgd.removeAll();
 	}
 	
@@ -296,11 +301,10 @@
 		
 		var ddm = app.getCanvas().ddm;
 		_selectedDefinition = _toolOutputDefin_cmb.dataProvider[_toolOutputDefin_cmb.selectedIndex];
-		_output_type_lbl.text = "Output Type: " + _selectedDefinition.type;
-
+		
 		switch(_selectedDefinition.type) {
 			case ToolOutputDefinition.LONG:
-				removeAllItems();
+				if(evt != null) removeAllItems();
 		
 				_start_value_stp.visible = true;
 				_end_value_stp.visible = true;
@@ -322,7 +326,6 @@
 				break;
 			
 			case ToolOutputDefinition.BOOL:
-				removeAllItems();
 				
 				_start_value_stp.visible = false;
 				_end_value_stp.visible = false;
@@ -334,9 +337,11 @@
 				_condition_range_lbl.visible = false;
 				
 				// add default conditions for boolean output type
-				addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, true));
-				addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, false));
-				
+				if(evt != null) {
+					removeAllItems();
+					addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, true));
+					addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, false));
+				}
 				break;
 			default:
 				Debugger.log("type not found", Debugger.GEN, "itemChanged", "ToolOutputConditionsDialog");
@@ -376,7 +381,7 @@
     * Called by the CLOSE button 
     */
     private function close(){
-		app.pi.openConditionMatchingDialog();
+		app.pi.openConditionMatchDialog();
 		 
         _container.deletePopUp();
     }
@@ -445,5 +450,9 @@
     */
     function set container(value:MovieClip){
         _container = value;
-    }
+    }
+	
+	public function set branchingActivity(a:BranchingActivity) {
+		_branchingActivity = a;
+	}
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -668,14 +668,11 @@
 		// open group to branch matching window
 		app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('to_conditions_dlg_title_lbl'), closeButton:true, viewResize:false, scrollContentPath:'ToolOutputConditionsDialog'});
 		app.dialog.addEventListener('contentLoaded', Proxy.create(this, ToolOutputConditionsDialogLoaded, ta));
-		
-		Debugger.log("conditions button pressed", Debugger.CRITICAL, "openToolOutputConditionsDialog", "CanvasController");
 	}
 	
 	private function ToolOutputConditionsDialogLoaded(evt:Object, ta:ToolActivity) {
+		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
 		evt.target.scrollContent.definitions = ta.definitions;
-		Debugger.log("def length: " + ta.definitions.length, Debugger.CRITICAL, "ToolOutputConditionsDialogLoaded", "CanvasController");
-	
 		evt.target.scrollContent.setupContent();
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -597,10 +597,6 @@
 		if(sequence.firstActivityUIID != null) {
 			var b:Branch = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_FROM_START, _cv.ddm.getActivityByUIID(sequence.firstActivityUIID).activityUIID, branchingActivity.activityUIID, sequence, _cv.ddm.learningDesignID);
 			_cv.ddm.addBranch(b);
-			
-			if(BranchingActivity(branchingActivity).defaultBranch == null) {
-				BranchingActivity(branchingActivity).defaultBranch = b;
-			}
 		
 			// TODO: review
 			if(!sequence.stopAfterActivity) {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -115,7 +115,9 @@
 		_group_match_btn.addEventListener("click", Delegate.create(this, onGroupMatchClick));
 		_group_naming_btn.addEventListener("click", Delegate.create(this, onGroupNamingClick));
 		_tool_output_match_btn.addEventListener("click", Delegate.create(this, onConditionMatchClick));
-		_conditions_setup_btn.addEventListener("click", Delegate.create(this, onConditionsSetupClick));
+		_conditions_setup_btn.addEventListener("click", Delegate.create(this, onConditionsSetupClick));
+		
+		_pi_defaultBranch_cb.addEventListener("click", Delegate.create(this, onDefaultBranchSelect));
 		
 		this.onEnterFrame = setupLabels;
 		
@@ -297,6 +299,8 @@
 				
 			title_txt.text = StringUtils.cleanNull(a.title);
 			desc_txt.text = StringUtils.cleanNull(a.description);
+			
+			showBranchControls(false);
 			
 		} else if(CanvasOptionalActivity(cm.selectedItem) != null){
 			var co = CanvasOptionalActivity(cm.selectedItem);
@@ -305,7 +309,8 @@
 			cover_pnl.visible = false;
 			delimitLine._visible = true;
 				
-			showGeneralControls(true, !co.activity.readOnly);
+			showGeneralControls(true, !co.activity.readOnly);
+			showBranchControls(false);
 			showGroupingControls(false);
 			showBranchingControls(false);
 			showToolActivityControls(false);
@@ -328,7 +333,8 @@
 			delimitLine._visible = true;
 			
 			showOptionalControls(false);
-			showGeneralControls(true, !co.activity.readOnly);
+			showGeneralControls(true, !co.activity.readOnly);
+			showBranchControls(false);
 			showGeneralInfo(false);
 			showGroupingControls(false);
 			showBranchingControls(false);
@@ -353,7 +359,8 @@
 			
 			showTransitionProperties(t);
 			
-			showGeneralInfo(false);
+			showGeneralInfo(false);
+			showBranchControls(false);
 			showGeneralControls(false);
 			showOptionalControls(false);
 			showGroupingControls(false);
@@ -372,6 +379,7 @@
 			showBranchProperties(branch);
 			
 			showGeneralControls(true, !branch.sequenceActivity.readOnly);
+			showBranchControls(true);
 			
 			showGeneralInfo(false);
 			showOptionalControls(false);
@@ -387,7 +395,8 @@
 			
 			toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> ";
 			
-			showGeneralInfo(true);
+			showGeneralInfo(true);
+			showBranchControls(false);
 			showGroupingControls(false);
 			showBranchingControls(false);
 			showGeneralControls(false);
@@ -489,13 +498,18 @@
 	private function showTransitionProperties(t:Transition){
 		//TODO: show from act and to act
 		
+	}
+	
+	private function showBranchControls(v:Boolean):Void {
+		_pi_defaultBranch_cb.visible = v;
 	}
 	
 	private function showBranchProperties(b:Branch){
 		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_activity_type_sequence');
+		title_txt.text = b.sequenceActivity.title;
 		
-		title_txt.text = b.sequenceActivity.title;
-		
+		_pi_defaultBranch_cb.selected = (b.sequenceActivity.activityUIID == _canvasModel.activeView.activity.defaultBranch.sequenceActivity.activityUIID) ? true : false;
+		_pi_defaultBranch_cb.enabled = !_pi_defaultBranch_cb.selected;
 	}
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r225e064e28caa76ed2e5348e15e1d2b71679d001 -rcd33f92df2c46dfe2e817281d501e179a6094637
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 225e064e28caa76ed2e5348e15e1d2b71679d001)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
@@ -127,6 +127,9 @@
 	private var max_lbl:Label;
 	private var minAct_stp:NumericStepper;
 	private var maxAct_stp:NumericStepper;
+	
+	// Branch Connector
+	private var _pi_defaultBranch_cb:CheckBox;
 	
 	//screen assets:
 	private var body_pnl:Panel;
@@ -192,7 +195,10 @@
 		_group_match_btn.label = Dictionary.getValue('pi_group_match_btn_lbl');
 		_group_naming_btn.label = Dictionary.getValue('pi_group_naming_btn_lbl');
 		_tool_output_match_btn.label = Dictionary.getValue('pi_tomatch_btn_lbl');
-		_conditions_setup_btn.label = Dictionary.getValue('pi_condmatch_btn_lbl');
+		_conditions_setup_btn.label = Dictionary.getValue('pi_condmatch_btn_lbl');
+		
+		// Branch 
+		_pi_defaultBranch_cb.label = Dictionary.getValue("_pi_defaultBranch_cb_lbl");
 		
 		//populate the synch type combo:
 		gateType_cmb.dataProvider = Activity.getGateActivityTypes();
@@ -780,7 +786,9 @@
 		endHours_stp.setStyle('styleName', styleObj);
 		endMins_stp.setStyle('styleName', styleObj);
 		minAct_stp.setStyle('styleName', styleObj);
-		maxAct_stp.setStyle('styleName', styleObj);
+		maxAct_stp.setStyle('styleName', styleObj);
+		
+		_pi_defaultBranch_cb.setStyle('styleName', styleObj);
 		
 		
 		styleObj = _tm.getStyleObject('picombo');
@@ -1026,7 +1034,7 @@
 	private function onConditionMatchClick(evt:Object){
 		// open group to branch matching window
 		_app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('condmatch_dlg_title_lbl'), closeButton:true, viewResize:false, scrollContentPath:'ConditionMatchingDialog'});
-		_app.dialog.addEventListener('contentLoaded', Delegate.create(this, ConditionMatchingDialogLoaded));
+		_app.dialog.addEventListener('contentLoaded', Delegate.create(this, ConditionMatchDialogLoaded));
 		
 		setModified();
 	}
@@ -1061,11 +1069,12 @@
 		evt.target.scrollContent.setupGrid();
 	}
 	
-	private function ConditionMatchingDialogLoaded(evt:Object) {
+	private function ConditionMatchDialogLoaded(evt:Object) {
 		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
+		var conditions:Array = _canvasModel.getCanvas().ddm.getAllConditions();
 		
 		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
-		evt.target.scrollContent.conditions = _canvasModel.getCanvas().ddm.conditions.values();
+		evt.target.scrollContent.conditions = conditions;
 		evt.target.scrollContent.branches = getValidBranches(branches.myBranches);
 		
 		evt.target.scrollContent.loadLists();
@@ -1078,6 +1087,13 @@
 		}
 		
 		return branches;
+	}
+	
+	public function onDefaultBranchSelect(evt:Object):Void {
+		if(_pi_defaultBranch_cb.selected) {
+			_canvasModel.activeView.activity.defaultBranch = BranchConnector(_canvasModel.selectedItem).branch; _pi_defaultBranch_cb.selected
+			_pi_defaultBranch_cb.enabled = false;
+		}
 	}
 	
    /**