Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -raf26890a57ea13484e2f9e9acba607a320fe9724 -rc8a3ab790f64597f8a37e88e5805014136695b16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision af26890a57ea13484e2f9e9acba607a320fe9724)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision c8a3ab790f64597f8a37e88e5805014136695b16)
@@ -33,6 +33,7 @@
 import org.lamsfoundation.lams.common.ApplicationParent;
 import org.lamsfoundation.lams.monitoring.mv.MonitorModel;
 import org.lamsfoundation.lams.monitoring.mv.MonitorController;
+import org.lamsfoundation.lams.monitoring.mv.tabviews.MonitorTabView;
 
 import mx.controls.*;
 import mx.containers.*;
@@ -146,7 +147,6 @@
 	 * @param   event
 	 */
 	public function update (o:Observable, infoObj:Object):Void{
-			
 		   var mm:MonitorModel = MonitorModel(o);
 		   infoObj.target = mm;
 		   
@@ -211,6 +211,12 @@
 			case 'SELECTED_ITEM':
                 highlightActivity(_model);
                 break;
+			case 'DRAW_ALL' :
+				Debugger.log("received draw all. " + event.tabID + " locked: " + MonitorModel(_model).locked, Debugger.CRITICAL, "viewUpdate", "CanvasBranchView");
+				if (!MonitorModel(_model).locked){
+					drawAll(event.data, _model);
+				}
+				break;
 			case 'SET_ACTIVE':
 				Debugger.log('setting activie :' + event.updateType + " event.data: " + event.data + " condition: " + (event.data == this),Debugger.CRITICAL,'update','org.lamsfoundation.lams.CanvasBranchView');
 				transparentCover._visible = (event.data == this) ? false : true;
@@ -396,7 +402,7 @@
 	 * @return  Boolean - successfullit
 	 */
 	private function drawActivity(a:Activity, cm):Boolean {
-		if(this.activity.activityUIID != cm.getCanvas().ddm.getActivityByUIID(a.parentUIID).parentUIID) 
+		if(this.activity.activityUIID != ddm.getActivityByUIID(a.parentUIID).parentUIID) 
 			return false;
 		
 		var cbv = CanvasBranchView(this);
@@ -462,6 +468,14 @@
 		return true;
 	}
 	
+	private function drawAll(objArr:Array, model:Observable){
+		Debugger.log("drawing all: " + objArr.length + " model: " + model, Debugger.CRITICAL, "drawAll", "CanvasBranchView");
+				
+		for (var i=0; i<objArr.length; i++){
+			update(model, objArr[i]);
+		}
+	}
+	
 	/**
 	 * Add to canvas stage but keep hidden from view.
 	 * 
@@ -472,7 +486,7 @@
 	 */
 	
 	private function hideActivity(a:Activity, cm):Boolean {
-		if(this.activity.activityUIID != cm.getCanvas().ddm.getActivityByUIID(a.parentUIID).parentUIID) 
+		if(this.activity.activityUIID != ddm.getActivityByUIID(a.parentUIID).parentUIID) 
 			return false;
 			
 		var cbv = CanvasBranchView(this);
@@ -498,7 +512,7 @@
 	 * @return  Boolean - successfull
 	 */
 	private function removeActivity(a:Activity, cm):Boolean{
-		if(this.activity.activityUIID != cm.getCanvas().ddm.getActivityByUIID(a.parentUIID).parentUIID) 
+		if(this.activity.activityUIID != ddm.getActivityByUIID(a.parentUIID).parentUIID) 
 			return false;
 		
 		if(a.isBranchingActivity())
@@ -641,6 +655,7 @@
     */
 	private function setSize(cm):Void{
 		var ba = cm.currentBranchingActivity;
+		Debugger.log("currentBranchActivity: " + ba, Debugger.CRITICAL, "setSize", "CanvasBranchView");
 		
 		var s:Object = cm.getSize();
 		
@@ -668,21 +683,26 @@
 			
 		canvas_scp.redraw(true);
 		
-		setPosition(cm);
+		setPosition(cm, cx, cy);
 	}
 	
 	/**
     * Sets the position of the canvas on stage, called from update
     * @param cm Canvas model object 
     */
-	private function setPosition(cm):Void{
-        var ba = cm.activitiesDisplayed.get(activity.activityUIID);
+	private function setPosition(cm, cx, cy){
+      //  var ba = (_ba != null || _ba == undefined) ? cm.activitiesDisplayed.get(activity.activityUIID) : _ba;
 		
-		if(ba != null) {
-			var cx:Number = ba._x + ba.getVisibleWidth()/2;
-			var cy:Number = ba._y + ba.getVisibleHeight()/2;
+		Debugger.log("cm: " + cm.activitiesDisplayed, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
+		Debugger.log("act UIID: " + activity.activityUIID, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
+		
+		Debugger.log("cx: " + cx, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
+		
+		if(cx != null && cy != null) {
+			//var cx:Number = ba._x + ba.getVisibleWidth()/2;
+			//var cy:Number = ba._y + ba.getVisibleHeight()/2;
 			
-			Debugger.log("current: " + ba.activity.activityUIID, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
+			//Debugger.log("current: " + ba.activity.activityUIID, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
 			
 			if(_isBranchChild) 
 				Debugger.log("bc cx: " + cx + " // bc cy: " + cy, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
@@ -773,8 +793,6 @@
 			Debugger.log("monitor controller: " + c, Debugger.CRITICAL,'getController','CanvasBranchView');
 			return MonitorController(c);
 		}
-
-		//return (c instanceof CanvasController) ? CanvasController(c) : MonitorController(c);
 	}
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
===================================================================
diff -u -r63e4ddc1e3bb7b6ca1da4a02ee3d0d148552dee8 -rc8a3ab790f64597f8a37e88e5805014136695b16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision 63e4ddc1e3bb7b6ca1da4a02ee3d0d148552dee8)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision c8a3ab790f64597f8a37e88e5805014136695b16)
@@ -459,6 +459,7 @@
 		
 		var cx:Number = ba._x + ba.getVisibleWidth()/2;
 		var cy:Number = ba._y + ba.getVisibleHeight()/2;
+		
 		var isVisible:Boolean = (visible == null) ? true : visible;
 		
 		var _branchView_mc:MovieClip = MovieClip(monitorView.getMonitorTabView()).createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible});	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r04312a491c2548738782967098dad6b53ff78a56 -rc8a3ab790f64597f8a37e88e5805014136695b16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 04312a491c2548738782967098dad6b53ff78a56)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision c8a3ab790f64597f8a37e88e5805014136695b16)
@@ -912,13 +912,16 @@
 	
 	public function openBranchActivityContent(ba, visible:Boolean):Void {
 		currentBranchingActivity = ba;
-		Debugger.log("openBranchActivityContent invoked", Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
+		
+		Debugger.log("openBranchActivityContent invoked: " + ba, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
+		
 		if(visible == null) visible = true;
+		
 		Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
 		
 		if(ba.branchView != null) {
 			activeView = (visible) ? ba.branchView : activeView;
-			// for monitoring activeView = ba.branchView
+			
 			ba.branchView.setOpen(visible);
 			ba.branchView.open();
 			
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as
===================================================================
diff -u -re2fcbae966f671de6b2c8fc2457543e33cf4d7b7 -rc8a3ab790f64597f8a37e88e5805014136695b16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	(.../LearnerIndexView.as)	(revision e2fcbae966f671de6b2c8fc2457543e33cf4d7b7)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	(.../LearnerIndexView.as)	(revision c8a3ab790f64597f8a37e88e5805014136695b16)
@@ -171,7 +171,7 @@
 				}
 				break;
 			default :
-				Debugger.log('unknown update type :' + infoObj.updateType,Debugger.GEN,'update','org.lamsfoundation.lams.MonitorTabView');
+				Debugger.log('unknown update type :' + infoObj.updateType,Debugger.GEN,'update','org.lamsfoundation.lams.LearnerIndexView');
 		}
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as
===================================================================
diff -u -r7ab40c8ccdb695e61a1f0299757a870305dba3f6 -rc8a3ab790f64597f8a37e88e5805014136695b16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as	(.../MonitorGateView.as)	(revision 7ab40c8ccdb695e61a1f0299757a870305dba3f6)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as	(.../MonitorGateView.as)	(revision c8a3ab790f64597f8a37e88e5805014136695b16)
@@ -125,7 +125,7 @@
 					}
 					break;
 				default :
-					Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorTabView');
+					Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorGateView');
 		}
 	}
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
diff -u -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4 -rc8a3ab790f64597f8a37e88e5805014136695b16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision c8a3ab790f64597f8a37e88e5805014136695b16)
@@ -364,14 +364,15 @@
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
 			newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity", DepthManager.kTop, {_activity:a, _children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc});	
 		} else if(a.isBranchingActivity()){	
-			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity", DepthManager.kBottom, {_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false});
+			newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity", DepthManager.kBottom, {_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false});
 		} else {
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView');
 		}
 		
 		var actItems:Number = mm.activitiesDisplayed.size()
 		
-		if (actItems < mm.getActivityKeys().length && newActivity_mc != null){
+		if (actItems < mm.getActivityKeys().length && newActivity_mc != null){
+			Debugger.log("adding to hashtable: " + newActivity_mc.activity.activityUIID, Debugger.CRITICAL, "drawActivity", "MonitorTabView");
 			mm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 		}
 		
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as
===================================================================
diff -u -r121f6514853e03e838776b63cec0efb961a42c64 -rc8a3ab790f64597f8a37e88e5805014136695b16
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 121f6514853e03e838776b63cec0efb961a42c64)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision c8a3ab790f64597f8a37e88e5805014136695b16)
@@ -160,10 +160,7 @@
 			//loadIcon();
 		}
 		
-		Debugger.log('initialising activity : ' + _activity.activityID ,Debugger.CRITICAL,'init','org.lamsfoundation.lams.LearnerActivity');
-		Debugger.log("actStatus:"+ actStatus, 4,'init','LearnerActivity');
-		
-		this.onEnterFrame = draw; // MovieClipUtils.doLater(Proxy.create(this, draw));
+		MovieClipUtils.doLater(Proxy.create(this, draw));
 
 	}
 	
@@ -196,7 +193,6 @@
 	 * @return  
 	 */
 	private function draw(){
-		delete this.onEnterFrame;
 		
 		var toolTitle:String
 		if (actStatus == null || actStatus == undefined){
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rcd71ab45b3373f11dbb8e7af2e670cde625b9842 -rc8a3ab790f64597f8a37e88e5805014136695b16
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rcd71ab45b3373f11dbb8e7af2e670cde625b9842 -rc8a3ab790f64597f8a37e88e5805014136695b16
Binary files differ