Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
===================================================================
diff -u -r78cf415a0c5ed341d97bebacb5fe638133aaa313 -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision 78cf415a0c5ed341d97bebacb5fe638133aaa313)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41)
@@ -78,7 +78,7 @@
 											  : new Point(toAct_mc.getActivity().xCoord + toOTC.x, toAct_mc.getActivity().yCoord + toOTC.y);
 		
 		createConnection(fromAct_mc, toAct_mc, _startPoint, _endPoint, fromOTC, toOTC);
-			
+		
 	}
 	
 	private function drawActivityless():Void {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision ed0751bf76b6e95126836f3d8a51c7f60277a742)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41)
@@ -492,12 +492,6 @@
 			else
 				_canvasModel.openBranchActivityContent(this, false);
 		
-		if(_module == "monitoring")
-			continue;
-			//mm.drawNext();
-		else
-			_canvasModel.drawNext();
-		
 	}
 
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision ed0751bf76b6e95126836f3d8a51c7f60277a742)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41)
@@ -353,22 +353,13 @@
 		//dimentions of container (this)
 		setLocking();
 			
-		if(fromModuleTab == "monitorMonitorTab") //{
-			drawLearners();
-		//} else {
-			//_canvasView.model.releaseNextFromBranchingQueue();
-		//}
-			
+		if(fromModuleTab == "monitorMonitorTab")
+			drawLearners();
 		
 		Debugger.log ("I am in Draw :" + _activity.title + 'uiID:' + _activity.activityUIID + ' children:' + _children.length, Debugger.GEN, 'Draw', 'CanvasOptionalActivity');
-		_visible = true;
 		
-		if(fromModuleTab == "monitorMonitorTab")
-			continue;
-			//mm.drawNext();
-		else
-			_canvasView.model.drawNext();
-
+		_visible = true;
+		
 	}
 	
 	private function setLocking():Void{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision ed0751bf76b6e95126836f3d8a51c7f60277a742)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41)
@@ -271,12 +271,7 @@
 		setStyles();
 		
 		_visible = true;
-		
-		if(fromModuleTab == "monitorMonitorTab")
-			continue;
-			//mm.drawNext();
-		else
-			_canvasView.model.drawNext();
+
 	}
 	
 	private function setStyles():Void {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as
===================================================================
diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision ed0751bf76b6e95126836f3d8a51c7f60277a742)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41)
@@ -329,12 +329,6 @@
 			bgNegative = "true"
 			setStyles();
 		}
-		
-		if(_module == "monitoring")
-			continue;
-			//mm.drawNext();
-		else
-			_canvasModel.drawNext();
 	}
 	
 	private function localOnPress():Void{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision ed0751bf76b6e95126836f3d8a51c7f60277a742)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41)
@@ -76,13 +76,7 @@
 	private var _doRefresh:Boolean;
 	private var _activeRefresh:Boolean;
 	private var _refreshQueueCount:Number;
-	private var _branchingQueue:Array;
-	
-	private var drawCount:Number;
-	private var maxCount:Number;
-	
-	private var eventArr:Array;
-		
+	private var _branchingQueue:Array;
 	
 	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
@@ -308,7 +302,7 @@
 	private function refreshDesign(){
 	
 		Debugger.log('Running',Debugger.GEN,'refreshDesign','CanvasModel');
-		eventArr = new Array();
+		var eventArr:Array = new Array();
 		
 		if(activeRefresh) {
 			_refreshQueueCount++;
@@ -433,9 +427,9 @@
 			}
 		}
 		
-		stopRefresh();
 		
 		broadcastViewUpdate("DRAW_ALL", eventArr);
+		stopRefresh();
 		
 		if(_refreshQueueCount > 0) {
 			_refreshQueueCount = 0;
@@ -444,34 +438,6 @@
 		
 	}
 	
-	private function drawAll(){
-		drawCount = 0;
-		
-		maxCount = eventArr.length;
-		
-		Debugger.log("drawing all activities: " + maxCount, Debugger.CRITICAL, "drawAll", "CanvasSuperModel");
-		
-		drawNext();
-	}
-	
-	public function drawNext():Void {
-		if(drawCount < maxCount) {
-			Debugger.log("drawing: " + eventArr[drawCount].updateType, Debugger.CRITICAL, "drawNext", "LearnerTabView");
-			
-			broadcastViewUpdate(eventArr[drawCount].updateType, eventArr[drawCount].data);
-			
-		} else {
-			if(_refreshQueueCount > 0) {
-				_refreshQueueCount = 0;
-				refreshDesign();
-			}
-			
-			return;
-		}
-		
-		drawCount++;
-	}
-	
 	public function createViewUpdate(updateType, data):Object {
 		setChanged();
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as
===================================================================
diff -u -ra51a3578f817472254bb2e84b301122a6d8268cd -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as	(.../CanvasTransition.as)	(revision a51a3578f817472254bb2e84b301122a6d8268cd)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as	(.../CanvasTransition.as)	(revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41)
@@ -80,7 +80,7 @@
 		_endPoint = new Point(toAct_mc.getActivity().xCoord + toOTC.x, toAct_mc.getActivity().yCoord + toOTC.y);
 		
 		createConnection(fromAct_mc, toAct_mc, _startPoint, _endPoint, fromOTC, toOTC);
-			
+		
 	}
 
 	private function onPress():Void{