Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r09d397307cdeb56f597caf45fde99302c4b541bd -r2e97ddd536091a64a868ee3b89018fad86c1e097
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 09d397307cdeb56f597caf45fde99302c4b541bd)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 2e97ddd536091a64a868ee3b89018fad86c1e097)
@@ -89,18 +89,18 @@
 	   
    }
    
-   private function clearAllSelections(optionalOnCanvas:Array, parallelOnCanvas:Array){
+   public function clearAllSelections(optionalOnCanvas:Array, parallelOnCanvas:Array){
 	for (var i=0; i<optionalOnCanvas.length; i++){
 			for(var j=0; j < optionalOnCanvas[i].actChildren.length; j++){
 				optionalOnCanvas[i].actChildren[j].setSelected(false);
 			}
-			optionalOnCanvas[i].init()
+			optionalOnCanvas[i].refreshChildren();
 		}
 		for (var m=0; m<parallelOnCanvas.length; m++){
 			for(var n=0; n < parallelOnCanvas[m].actChildren.length; n++){
 				parallelOnCanvas[m].actChildren[n].selectActivity = "false";
 			}
-			parallelOnCanvas[m].init()
+			parallelOnCanvas[m].refreshChildren();
 		}
    }
 	
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r9222896e435ef8f2a9457cf97d85b94773d9b31b -r2e97ddd536091a64a868ee3b89018fad86c1e097
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 9222896e435ef8f2a9457cf97d85b94773d9b31b)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 2e97ddd536091a64a868ee3b89018fad86c1e097)
@@ -53,6 +53,7 @@
 	private var _isDirty:Boolean;
 	private var _activeTool:String;
 	private var _selectedItem:Object;  // the currently selected thing - could be activity, transition etc.
+	private var _prevSelectedItem:Object;
 	private var _isDrawingTransition:Boolean;
 	private var _transitionActivities:Array;
 	private var _isDragging:Boolean;
@@ -992,6 +993,7 @@
 	}
 	
 	private function setSelectedItem(newselectItem:Object){
+		prevSelectedItem = _selectedItem;
 		_selectedItem = newselectItem;
 		broadcastViewUpdate("SELECTED_ITEM");
 	}
@@ -1015,6 +1017,15 @@
 	public function set selectedItem (newselectItem:Object):Void {
 		setSelectedItem(newselectItem);
 	}
+	
+	public function set prevSelectedItem (oldselectItem:Object):Void {
+		_prevSelectedItem = oldselectItem;
+	}
+	
+	public function get prevSelectedItem():Object {
+		return _prevSelectedItem;
+	}
+	
 	/**
 	 * 
 	 * @usage   
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -r84a6ede47d5044cfcd7c701d378582dc7febda70 -r2e97ddd536091a64a868ee3b89018fad86c1e097
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 84a6ede47d5044cfcd7c701d378582dc7febda70)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 2e97ddd536091a64a868ee3b89018fad86c1e097)
@@ -104,8 +104,7 @@
 		MovieClipUtils.doLater (Proxy.create (this, init));
 	}
 	
-	public function init () : Void	{
-		
+	public function init():Void {
 		clickTarget_mc.onPress = Proxy.create (this, localOnPress);
 		clickTarget_mc.onRelease = Proxy.create (this, localOnRelease);
 		clickTarget_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside);
@@ -122,13 +121,12 @@
 		
 		CHILD_OFFSET_X = 8;
 		CHILD_OFFSET_Y = 57;
-		//childActivities_mc = this;
+		
 		for (var j=0; j<children_mc.length; j++){
 			children_mc[j].removeMovieClip();
 		}
 		children_mc = new Array();
 		
-		//childActivities_mc.removeMovieClip();
 		for (var i = 0; i < _children.length; i ++)		{
 			if (fromModuleTab == "monitorMonitorTab"){
 				children_mc [i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity"+i, childActivities_mc.getNextHighestDepth (), {_activity:_children [i] , _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring"});
@@ -147,6 +145,12 @@
 		MovieClipUtils.doLater (Proxy.create (this, draw));
 	}
 	
+	public function refreshChildren():Void {
+		for (var i = 0; i < children_mc.length; i ++)		{
+			children_mc[i].setSelected(false);
+		}
+	}
+	
 	private function showStatus(isVisible:Boolean){
 		completed_mc._visible = isVisible;
 		current_mc._visible = isVisible;
@@ -306,7 +310,12 @@
 	
 	public function get actChildren():Array {
 		return _children;
-	} 
+	}
+	
+	public function get children():Array {
+		return children_mc;
+	}
+	
 	public function get getpanelHeight():Number {
 		return panelHeight;
 	}
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -r84a6ede47d5044cfcd7c701d378582dc7febda70 -r2e97ddd536091a64a868ee3b89018fad86c1e097
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 84a6ede47d5044cfcd7c701d378582dc7febda70)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 2e97ddd536091a64a868ee3b89018fad86c1e097)
@@ -147,6 +147,11 @@
 		
 	}
 	
+	public function refreshChildren():Void {
+		child1_mc.setSelected(false);
+		child2_mc.setSelected(false);
+	}
+	
 	private function showStatus(isVisible:Boolean){
 		completed_mc._visible = isVisible;
 		current_mc._visible = isVisible;
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -r09d397307cdeb56f597caf45fde99302c4b541bd -r2e97ddd536091a64a868ee3b89018fad86c1e097
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 09d397307cdeb56f597caf45fde99302c4b541bd)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 2e97ddd536091a64a868ee3b89018fad86c1e097)
@@ -348,6 +348,8 @@
 		
 		
 		
+		
+		
 		//position
 		//newActivity_mc._x = a.xCoord;
 		//newActivity_mc._y = a.yCoord;
@@ -413,13 +415,20 @@
 		Debugger.log('running..',Debugger.CRITICAL,'highlightActivity','CanvasView');
 		var ca = CanvasActivity(cm.selectedItem);
 		var a:Activity = ca.activity;	
-		//deselect everything else
-		var CAsArray:Array = cm.activitiesDisplayed.values();
-		Debugger.log('CAsArray:'+CAsArray.length,Debugger.CRITICAL,'highlightActivity','CanvasView');
-		for(var i=0; i < CAsArray.length; i++){
-			CAsArray[i].setSelected(false);
+		
+		// deselect previously selected item
+		if(cm.prevSelectedItem != null) {
+			// if child of an complex activity is previously selected, it is easiest to clear all the children
+			if(cm.prevSelectedItem.activity.parentUIID != null) {
+				var caComplex = cm.activitiesDisplayed.get(cm.prevSelectedItem.activity.parentUIID);
+				caComplex.refreshChildren();
+			} else {
+				var dca:CanvasActivity = cm.activitiesDisplayed.get(cm.prevSelectedItem.activity.activityUIID);
+				dca.setSelected(false);
+			}
 		}
 		
+		
 		//try to cast the selected item to see what we have (instance of des not seem to work)
 		if(CanvasActivity(cm.selectedItem) != null){
 			Debugger.log('Its a canvas activity',4,'highlightActivity','CanvasView');
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r9222896e435ef8f2a9457cf97d85b94773d9b31b -r2e97ddd536091a64a868ee3b89018fad86c1e097
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r9222896e435ef8f2a9457cf97d85b94773d9b31b -r2e97ddd536091a64a868ee3b89018fad86c1e097
Binary files differ