Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r9422db882c1a9a8f9cbb15479c13df10428a0e13 -r837d613b49df41259866b6caa79fb43d5fe4fb48
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r9422db882c1a9a8f9cbb15479c13df10428a0e13 -r837d613b49df41259866b6caa79fb43d5fe4fb48
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as
===================================================================
diff -u -r6315ccfc298871795f8ab124b561646cc09a93f5 -r837d613b49df41259866b6caa79fb43d5fe4fb48
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as	(.../ToolkitController.as)	(revision 6315ccfc298871795f8ab124b561646cc09a93f5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as	(.../ToolkitController.as)	(revision 837d613b49df41259866b6caa79fb43d5fe4fb48)
@@ -65,12 +65,15 @@
 		
 		var iconMouseX = _xmouse - cv.model.getPosition().x;
 		var iconMouseY = _ymouse - cv.model.getPosition().y;
+		
+		Debugger.log("iconMouseX: "+iconMouseX+" iconMouseY: "+iconMouseY, Debugger.GEN, "iconDrop", "ToolkitController");
+		
 		var optionalOnCanvas:Array  = cv.getCanvasModel().findOptionalActivities();
 		
 		//SEE IF ITS HIT the canvas
-		var isCanvasDrop:Boolean = cv.getCanvasModel().activeView.hitTest(dragIcon_mc);
+		var isCanvasDrop:Boolean = cv.getCanvasModel().activeView.content.hitTest(dragIcon_mc);
 		
-		Debugger.log('isCanvasDrop:'+isCanvasDrop,4,'dropIcon','TemplateActivity');
+		Debugger.log('isCanvasDrop:'+isCanvasDrop,Debugger.GEN,'iconDrop','ToolkitController');
 		for (var i=0; i<optionalOnCanvas.length; i++){
 			var optionalX:Number = optionalOnCanvas[i].activity.xCoord;
 			var optionalY:Number = optionalOnCanvas[i].activity.yCoord;
@@ -94,11 +97,10 @@
 			}			
 		}
 		
-		if(isCanvasDrop){
-
-			//remove the drag icon
-			dragIcon_mc.removeMovieClip();
-			
+		//remove the drag icon
+		dragIcon_mc.removeMovieClip();
+		
+		if(isCanvasDrop){
 			var ta:TemplateActivity;
 			ta = _toolkitModel.getSelectedTemplateActivity();
 			Debugger.log('ta:'+ta.toolActivity.title,4,'canvasDrop','ToolkitController');