Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r7924333e2cf783345469f3321d2deb5ca570571f -r44ced49b5c5e10ec15551f036d98c125b4005e5c
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r7924333e2cf783345469f3321d2deb5ca570571f -r44ced49b5c5e10ec15551f036d98c125b4005e5c
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r172dc8bd6075a4e7501c0e0cf4f5ddaa18399b1c -r44ced49b5c5e10ec15551f036d98c125b4005e5c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 172dc8bd6075a4e7501c0e0cf4f5ddaa18399b1c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 44ced49b5c5e10ec15551f036d98c125b4005e5c)
@@ -1644,5 +1644,16 @@
 			return 1;
 	}
 
+	public function getValidTransitionsKeys():Array {
+		var keys:Array = transitions.keys();
+		var keysToSend:Array = new Array();
+		
+		for(var i=0; i<keys.length; i++) {
+			if(!transitions.get(keys[i]).isOptionalSequenceTransition())
+				keysToSend.push(keys[i]);
+		}
+		
+		return keysToSend;
+	}
 	
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Transition.as
===================================================================
diff -u -r70923fa577599b29f521d2daa8e348137e480bff -r44ced49b5c5e10ec15551f036d98c125b4005e5c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Transition.as	(.../Transition.as)	(revision 70923fa577599b29f521d2daa8e348137e480bff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Transition.as	(.../Transition.as)	(revision 44ced49b5c5e10ec15551f036d98c125b4005e5c)
@@ -78,7 +78,19 @@
 		return a.isGateActivity();
 	}
 	
+	public function isOptionalSequenceTransition():Boolean {
+		return checkOptionalSequenceTransition(this.toUIID) && checkOptionalSequenceTransition(this.fromUIID);
+	}
 	
+	private function checkOptionalSequenceTransition(UIID):Boolean {
+		var ddm = Application.getInstance().getDesignDataModel();
+		var a:Activity = ddm.getActivityByUIID(UIID);
+		var p:Activity = ddm.getActivityByUIID(a.parentUIID);
+		
+		return p.isOptionalSequenceActivity(ddm.getActivityByUIID(p.parentUIID));
+	}
+	
+	
 	public function toData():Object{
 		var dto:Object = new Object();
 		dto.transitionID = (_transitionID) ?  _transitionID : Config.NUMERIC_NULL_VALUE;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r023c7be853df8599cb2d6ed94979a08ef9120013 -r44ced49b5c5e10ec15551f036d98c125b4005e5c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 023c7be853df8599cb2d6ed94979a08ef9120013)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 44ced49b5c5e10ec15551f036d98c125b4005e5c)
@@ -612,7 +612,8 @@
 	 * @return  
 	 */
 	private function drawTransition(t:Transition, cm):Boolean{
-		if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayers) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false;
+		if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayers) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayers)) 
+			return false;
 		
 		var cbv = CanvasBranchView(this);
 		var cbc = getController();
@@ -705,7 +706,7 @@
 	 * @param   cm  The canvas model
 	 * @return  
 	 */
-	private function removeTransition(t:Transition,cm){
+	private function removeTransition(t:Transition, cm){
 		if(!cm.isActiveView(this)) return false;
 		
 		var r = cm.transitionsDisplayed.remove(t.transitionUIID);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -r172dc8bd6075a4e7501c0e0cf4f5ddaa18399b1c -r44ced49b5c5e10ec15551f036d98c125b4005e5c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 172dc8bd6075a4e7501c0e0cf4f5ddaa18399b1c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 44ced49b5c5e10ec15551f036d98c125b4005e5c)
@@ -464,8 +464,9 @@
 		}
 		
 		//now check the transitions:
-		var ddmTransition_keys:Array = _cv.ddm.transitions.keys();
+		var ddmTransition_keys:Array = _cv.ddm.getValidTransitionsKeys();
 		var cmTransition_keys:Array = _transitionsDisplayed.keys();
+		
 		var trLongest = Math.max(ddmTransition_keys.length, cmTransition_keys.length);
 		
 		//chose which array we are going to loop over