Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r74df890abf231f37393ff4b5b3c02aba30a856cc -r78a478065bcef420535a21a44d8437fd7ad2cb47
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r74df890abf231f37393ff4b5b3c02aba30a856cc -r78a478065bcef420535a21a44d8437fd7ad2cb47
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r74df890abf231f37393ff4b5b3c02aba30a856cc -r78a478065bcef420535a21a44d8437fd7ad2cb47
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 74df890abf231f37393ff4b5b3c02aba30a856cc)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 78a478065bcef420535a21a44d8437fd7ad2cb47)
@@ -416,8 +416,8 @@
 		else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
 			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);
 			
-			var newActivity_mc = (_module != "monitoring") ? activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _canvasController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly()})
-															: activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly(), fromModuleTab:fromModuleTab, learnerContainer:_learnerContainer_mc});
+			var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _canvasController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly()})
+															: activityLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly(), fromModuleTab:fromModuleTab, learnerContainer:_learnerContainer_mc});
 			
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 			Debugger.log('Optional activity Type 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/CanvasView.as
===================================================================
diff -u -r7ced9db5725f36fd33877261bd003223b2f834f1 -r78a478065bcef420535a21a44d8437fd7ad2cb47
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 7ced9db5725f36fd33877261bd003223b2f834f1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 78a478065bcef420535a21a44d8437fd7ad2cb47)
@@ -294,7 +294,7 @@
 		}
 		else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
 			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);
-			var newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cvc,_canvasView:cvv,_locked:a.isReadOnly()});
+			var newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cvc,_canvasView:cvv,_locked:a.isReadOnly()});
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 			Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
 		}
@@ -367,6 +367,10 @@
 	 * @return  
 	 */
 	private function drawTransition(t:Transition,cm:CanvasModel):Boolean{
+		Debugger.log("drawing transition..." , Debugger.CRITICAL, "drawTransition", "CanvasVieW");
+		Debugger.log("not activity on layer 1: " + !isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) , Debugger.CRITICAL, "drawTransition", "CanvasVieW");
+		Debugger.log("not activity on layer 2: " + !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayer) , Debugger.CRITICAL, "drawTransition", "CanvasVieW");
+		
 		if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false;
 		
 		var cvv = CanvasView(this);