Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r9282351053ddea658636c6d3ceab057212d30391 -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r9282351053ddea658636c6d3ceab057212d30391 -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as	(.../Branch.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as	(.../Branch.as)	(revision 96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63)
@@ -81,5 +81,13 @@
 	public function get hubUIID():Number {
 		return _hubUIID;
 	}
+	
+	public function get isStart():Boolean {
+		return (_direction == BranchConnector.DIR_FROM_START);
+	}
+	
+	public function get isEnd():Boolean {
+		return (_direction == BranchConnector.DIR_TO_END);
+	}
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r9282351053ddea658636c6d3ceab057212d30391 -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 9282351053ddea658636c6d3ceab057212d30391)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63)
@@ -245,6 +245,33 @@
 		}
 	}
 	
+	public function removeBranchByConnection(connectUIID, activity:BranchingActivity):Void {
+		var keyArray:Array = _branches.keys();
+		for(var i=0; i<keyArray.length; i++){
+			var branch:Branch = Branch(_branches.get(keyArray[i]));
+			if(branch.targetUIID == connectUIID) {
+				if(activity.firstActivityUIID == branch.sequenceActivity.activityUIID && branch.isStart)
+					activity.defaultBranch = findNewDefaultBranch(activity, branch);
+				
+				removeBranch(branch.branchUIID);
+			}
+		}
+	}
+	
+	private function findNewDefaultBranch(activity:BranchingActivity, branch:Branch):Branch {
+		var children:Array = getComplexActivityChildren(activity.activityUIID);
+		
+		for(var i=0; i<children.length; i++) {
+			if(SequenceActivity(children[i]) != branch.sequenceActivity) {
+				var branches:Array = getBranchesForActivityUIID(SequenceActivity(children[i]).activityUIID).myBranches;
+				for(var j=0; j<branches.length; j++) {
+					if(branches[j].isStart)
+						return Branch(branches[j]);
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Adds a branch to the DDM
 	 * @usage   
@@ -319,6 +346,7 @@
 		dispatchEvent({type:'ddmBeforeUpdate',target:this});
 		
 		var r:Object = _branches.remove(branchUIID);
+		
 		if(r==null){
 			return new LFError("Removing branch failed:"+branchUIID,"removeBranch",this,null);
 		}else{
@@ -329,21 +357,6 @@
 	}
 	
 	/**
-	 * Removes the branch from the DDM which are connected to the Activity 
-	 *  
-	 * @param   connectUIID connected Activity UIID (SequenceActivity)
-	 */
-	public function removeBranchByConnection(connectUIID):Void{
-		var keyArray:Array = _branches.keys();
-		for(var i=0; i<keyArray.length; i++){
-			var branch:Branch = Branch(_branches.get(keyArray[i]));
-			if(branch.fromUIID == connectUIID || branch.toUIID == connectUIID){
-				removeBranch(branch.branchUIID);
-			}
-		}
-	}
-	
-	/**
 	 * Removes the branch from the DDM
 	 * @usage   
 	 * @param   branchUIID 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r19f8cea7a6c3766f039d300645d7d464682fcb1f -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 19f8cea7a6c3766f039d300645d7d464682fcb1f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63)
@@ -372,7 +372,7 @@
 			Debugger.log('controller cbc :'+MonitorController(cbc), Debugger.CRITICAL, 'drawActivity','CanvasBranchView');
 			Debugger.log('controller obj cbc :'+cbc, Debugger.CRITICAL, 'drawActivity','CanvasBranchView');
 		
-			var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _canvsController:cbc, _canvasBranchView:cbv})
+			var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _canvasController:cbc, _canvasBranchView:cbv})
 															: activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc, _canvasBranchView:cbv, _module:_module});
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 			Debugger.log('Tool or gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasBranchView');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r029e69643ff0fb567d2d53ef9e63ba4bd035e50b -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 029e69643ff0fb567d2d53ef9e63ba4bd035e50b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63)
@@ -241,9 +241,13 @@
 	public function removeActivity(activityUIID:Number){
 		Debugger.log('activityUIID:'+activityUIID,4,'removeActivity','Canvas');
 		
-		// remove transitions connected to this activity being removed
-		_ddm.removeTransitionByConnection(activityUIID);
+		// remove transitions and/or branches connected to this activity being removed
+		_ddm.removeTransitionByConnection(activityUIID);
+		if(canvasModel.activeView instanceof CanvasBranchView)
+			_ddm.removeBranchByConnection(activityUIID, CanvasBranchView(canvasModel.activeView).activity);
+		
 		_ddm.removeActivity(activityUIID);
+		
 		canvasModel.setDirty();
 		canvasModel.selectedItem = null;
 	}