Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rdf3d8611396b8ee2f7af23a08ab07c7dcd7746d3 -r5b9f0b150997ca847824b7beba180b2a1006a68c
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rdf3d8611396b8ee2f7af23a08ab07c7dcd7746d3 -r5b9f0b150997ca847824b7beba180b2a1006a68c
Binary files differ
Index: lams_flash/src/central/flash/lams_authoring.fla
===================================================================
diff -u -rc00280fd5bd4810407e1105e5aad52218ff7bf6e -r5b9f0b150997ca847824b7beba180b2a1006a68c
Binary files differ
Index: lams_flash/src/central/flash/lams_authoring_main.fla
===================================================================
diff -u -rc00280fd5bd4810407e1105e5aad52218ff7bf6e -r5b9f0b150997ca847824b7beba180b2a1006a68c
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -rc00280fd5bd4810407e1105e5aad52218ff7bf6e -r5b9f0b150997ca847824b7beba180b2a1006a68c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision c00280fd5bd4810407e1105e5aad52218ff7bf6e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 5b9f0b150997ca847824b7beba180b2a1006a68c)
@@ -25,6 +25,7 @@
 import org.lamsfoundation.lams.common.ui.*;
 import org.lamsfoundation.lams.common.style.*;
 import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.authoring.br.*;
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.dict.*;
 import org.lamsfoundation.lams.common.mvc.*;
@@ -212,9 +213,11 @@
 		
 		Debugger.log('adding hubs for branch activity:' + _canvasBranchingActivity,Debugger.CRITICAL,'setupConenctorHubs','org.lamsfoundation.lams.CanvasBranchView');
 		
-		cHubStart_mc = activityLayer.createChildAtDepth("CanvasBranchingConnector",DepthManager.kTop,{_activity:_canvasBranchingActivity.activity,_canvasController:getController(),_canvasView:_canvasBranchView, _x: 0 , _y: 0});
+		// start-point connector hub
+		cHubStart_mc = activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity:_canvasBranchingActivity.activity,_canvasController:getController(),_canvasView:_canvasBranchView, _x: 0 , _y: 0});
 		
-		//cHubEnd_mc = activityLayer.createChildAtDepth("CanvasBranchingConnector",DepthManager.kTop,{_activity:_canvasBranchingActivity.activity,_canvasController:getController(),_canvasView:_canvasBranchView, _x: 0 , _y: 0});
+		// end-point connector hub
+		cHubEnd_mc = activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity:_canvasBranchingActivity.activity,_canvasController:getController(),_canvasView:_canvasBranchView, _x: 0 , _y: 0});
 
 	}
 	
@@ -228,9 +231,7 @@
 		} else {
 			// TODO: make the last create sequence activity in array (order id) the default?
 			var children:Array = _cm.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID);
-			// for(var i=0; i<children.length;i++) {
-				defaultSequenceActivity = children[children.length-1];
-			//}
+			defaultSequenceActivity = children[children.length-1];
 		}
 	}
 	
@@ -403,7 +404,8 @@
 		cm.branchesDisplayed.put(b.branchUIID,newBranch_mc);
 		Debugger.log('drawn a branch:'+b.branchUIID+','+newBranch_mc,Debugger.GEN,'drawBranch','CanvasView');
 		
-		cm.moveActivitiesToBranchSequence(b.targetUIID, b.sequenceActivity);
+		if(b.direction != BranchConnector.DIR_TO_END)
+			cm.moveActivitiesToBranchSequence(b.targetUIID, b.sequenceActivity);
 		
 		return true;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -rc00280fd5bd4810407e1105e5aad52218ff7bf6e -r5b9f0b150997ca847824b7beba180b2a1006a68c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision c00280fd5bd4810407e1105e5aad52218ff7bf6e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 5b9f0b150997ca847824b7beba180b2a1006a68c)
@@ -575,7 +575,8 @@
 		}
 		
 		if(_connectionActivities.length > 0) {
-			if(_connectionActivities[0].activityUIID == activeView.startHub.activity.activityUIID) {
+			if(_connectionActivities[0].activityUIID == activeView.startHub.activity.activityUIID || 
+			   activity.activityUIID == activeView.endHub.activity.activityUIID) {
 				return addActivityToBranch(activity);
 			} else {
 				return addActivityToTransition(activity);
@@ -616,7 +617,8 @@
 			}
 			
 			//lets make the connection
-			var b:Branch = createBranchStartConnector(_connectionActivities);
+			var b:Branch = (toAct == activeView.endHub.activity.activityUIID) ? createBranchEndConnector(_connectionActivities) 
+								: createBranchStartConnector(_connectionActivities);
 
 			Debugger.log('No validation errors, creating branch.......' + b,Debugger.GEN,'addActivityToBranch','CanvasModel');
 				
@@ -748,7 +750,6 @@
 	}
 	
 	/**
-	 * Forms a transition	
 	 * @usage   
 	 * @param   transitionActs An array of transition activities. Must only contain 2
 	 * @return  
@@ -764,7 +765,22 @@
 		
 		return b;
 	}
-	
+
+	/**
+	 * @usage   
+	 * @param   transitionActs An array of transition activities. Must only contain 2
+	 * @return  
+	 */
+	private function createBranchEndConnector(transitionActs:Array):Branch{
+		var fromAct:Activity = transitionActs[0];
+		var toAct:Activity = transitionActs[1];
+		
+		var sequence:Activity = _cv.ddm.getActivityByUIID(fromAct.parentUIID);
+		var b:Branch = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_TO_END, fromAct.activityUIID, activeView.endHub.activity.activityUIID, sequence, _cv.ddm.learningDesignID);
+		
+		return b;
+	}
+
 	public function moveActivitiesToBranchSequence(activityUIID:Number, sequence:SequenceActivity):Boolean {
 		// move first activity
 		var ca = _activitiesDisplayed.get(activityUIID);