Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rfce9353d57740da2a73ac09e6357991b2c850e33 -re7cf775d28d338b406ded86b467522e7bf63ec6f
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r871765a95a4b324ecb8bef7b59f930a90574bdf3 -re7cf775d28d338b406ded86b467522e7bf63ec6f
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -rfce9353d57740da2a73ac09e6357991b2c850e33 -re7cf775d28d338b406ded86b467522e7bf63ec6f
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision fce9353d57740da2a73ac09e6357991b2c850e33)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision e7cf775d28d338b406ded86b467522e7bf63ec6f)
@@ -751,17 +751,19 @@
 			}
 			
 			var branch = _cv.ddm.getBranchesForActivityUIID(toAct);
-			if(branch.target != null && branch.target.direction != BranchConnector.DIR_SINGLE) {
+			if(branch.target != null && branch.target.direction == BranchConnector.DIR_FROM_START) {
+				
 				return new LFError("Can't create transition between activities in different branches", "addActivityToTransition", this);
 			}
 			
 			var branchesArray:Array = _cv.ddm.branches.values();
 			for(var i=0; i<branchesArray.length; i++) {
 				if(branchesArray[i].targetUIID == toAct && branchesArray[i].direction == BranchConnector.DIR_TO_END) {
-					return new LFError("Cannot connect a new transition a closed sequence");
+					//return new LFError("Cannot connect a new transition a closed sequence");
+					
 				}
 				
-				if(branchesArray[i].targetUIID == fromAct && branchesArray[i].direction == BranchConnector.DIR_TO_END) {
+				if(branchesArray[i].targetUIID == fromAct && branchesArray[i].direction == BranchConnector.DIR_TO_END ) {
 					return new LFError("Cannot connect a new transition a closed sequence");
 				}
 			}
@@ -894,12 +896,36 @@
 		
 		// get next activity from transition
 		var transObj = _cv.ddm.getTransitionsForActivityUIID(activityUIID);
+		var branches = _cv.ddm.getBranchesForActivityUIID(activityUIID);
 		
+		if(transObj.out == null && branches.target != null) {
+			if(branches.target.sequenceActivity.activityUIID != sequence.activityUIID && branches.target.direction == BranchConnector.DIR_TO_END) {
+				
+				Debugger.log("end branch found: " + branches.target.branchUIID, Debugger.CRITICAL, "moveActivitiesToBranchSequence", "CanvasModel");
+				Debugger.log("tar seq: " + branches.target.sequenceActivity.activityUIID + " = " + sequence.activityUIID, Debugger.CRITICAL, "moveActivitiesToBranchSequence", "CanvasModel");
+				
+				if(!branches.target.sequenceActivity.stopAfterActivity) {
+					
+					_cv.removeBranch(branches.target.branchUIID);
+					MovieClipUtils.doLater(Proxy.create(this, moveBranchToSequence, activityUIID, sequence));
+					
+					Debugger.log("stopAfterActivity: " + sequence.stopAfterActivity, Debugger.CRITICAL, "moveActivitiesToBranchSequence", "CanvasModel");
+				}
+				
+			}
+		}
+		
 		return (transObj.out == null) ? true : moveActivitiesToBranchSequence(transObj.out.toUIID, sequence);
 
 	}
 	
+	private function moveBranchToSequence(activityUIID:Number, sequence:SequenceActivity):Void {
+		var b:Branch = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_TO_END, activityUIID, sequence.parentUIID, sequence, _cv.ddm.learningDesignID);
+		_cv.ddm.addBranch(b);
+		setDirty();
+	}
 	
+	
 	public function setDesignTitle(){
 		broadcastViewUpdate("POSITION_TITLEBAR", null);
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -rfce9353d57740da2a73ac09e6357991b2c850e33 -re7cf775d28d338b406ded86b467522e7bf63ec6f
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision fce9353d57740da2a73ac09e6357991b2c850e33)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision e7cf775d28d338b406ded86b467522e7bf63ec6f)
@@ -474,7 +474,7 @@
 				//NOTE!: we are passing in a ref to the tns in the ddm so if we change any props of this, we are changing the ddm
 				eventArr.push(createViewUpdate("DRAW_BRANCH", ddmBranch));
 			}else if(r_branch == "DELETE"){
-				eventArr.push(createViewUpdate("REMOVE_BRANCH",cmBranch));
+				eventArr.push(createViewUpdate("REMOVE_BRANCH", cmBranch));
 			}
 		}