Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -reb10423066222cb345c8518ab8a7e0703e673636 -r2c5294a0e44d4480a6ea15db6f6b552c15bccaa8
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision eb10423066222cb345c8518ab8a7e0703e673636)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 2c5294a0e44d4480a6ea15db6f6b552c15bccaa8)
@@ -72,7 +72,7 @@
 	    }else{
 		   //just select the activity
 			
-			//var parentActTypeID = _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID).activityTypeID
+			var parentActTypeID = _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID).activityTypeID
 			trace("parent UIID: "+ ca.activity.parentUIID + " and parent's activity type ID: ")
 			 //if (ca.activity.parentUIID > 0 && parentActTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 			//	 _canvasModel.selectedItem = null;
@@ -82,10 +82,19 @@
 			//	LFMessage.showMessageAlert(msg);
 				
 			 //}else {
+				 //_canvasModel.selectedItem = ca;
+				// _canvasModel.isDragging = true;
+				 //ca.startDrag(false);
+			 //}
+			 
+			 if(ca.activity.parentUIID != null && parentActTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 				 _canvasModel.selectedItem = ca;
+				 _canvasModel.isDragging = false;
+			 } else {
+				 _canvasModel.selectedItem = ca;
 				 _canvasModel.isDragging = true;
-				 ca.startDrag(false);
-			 //}
+				 ca.startDrag(false);
+			 }
 		}
 	   
    }
@@ -119,6 +128,7 @@
 			}
 			
 			var optionalOnCanvas:Array  = _canvasModel.findOptionalActivities();
+			
 			if (ca.activity.parentUIID != null){
 				trace ("testing Optional child on Canvas "+ca.activity.activityUIID)
 				for (var i=0; i<optionalOnCanvas.length; i++){
@@ -127,37 +137,48 @@
 						if (optionalOnCanvas[i].locked == false){
 							if (ca._x > 142 || ca._x < -129 || ca._y < -55 || ca._y > optionalOnCanvas[i].getpanelHeight){
 								trace (ca.activity.activityUIID+" had a hitTest with canvas.")
-						
+								//give it the new co-ords and 'drop' it
+								ca.activity.xCoord = _xmouse - _canvasModel.getPosition().x;
+								ca.activity.yCoord = _ymouse - _canvasModel.getPosition().y;
 								_canvasModel.removeOptionalCA(ca, optionalOnCanvas[i].activity.activityUIID);
+							} else {
+								ca._x = ca.activity.xCoord;
+								ca._y = ca.activity.yCoord;
 							}
 						}
 					}
 				}
-			}
-			//if we are on the optional Activity remove this activity from canvas and assign it a parentID of optional activity and place it in the optional activity window.
-			for (var i=0; i<optionalOnCanvas.length; i++){
-				//trace ("testing Optional on Canvas "+i)
-				if (ca.activity.activityUIID != optionalOnCanvas[i].activity.activityUIID){
-					if (ca.hitTest(optionalOnCanvas[i])){
-						if (optionalOnCanvas[i].locked == true){
-							var msg:String = Dictionary.getValue('act_lock_chk');
-							LFMessage.showMessageAlert(msg);
-						}else{
-							_canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca)
-						}						
+			} else {
+			
+				//if we are on the optional Activity remove this activity from canvas and assign it a parentID of optional activity and place it in the optional activity window.
+				for (var i=0; i<optionalOnCanvas.length; i++){
+					//trace ("testing Optional on Canvas "+i)
+					if (ca.activity.activityUIID != optionalOnCanvas[i].activity.activityUIID){
+						if (ca.hitTest(optionalOnCanvas[i])){
+							if (optionalOnCanvas[i].locked == true){
+								var msg:String = Dictionary.getValue('act_lock_chk');
+								LFMessage.showMessageAlert(msg);
+							}else{
+								_canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca)
+							}						
+						}
 					}
 				}
+				
 			}
-						
+			
+			
 			//get a view if ther is not one
 			if(!_canvasView){
 				_canvasView =  CanvasView(getView());
 			}
 			
+			
 			//give it the new co-ords and 'drop' it
 			ca.activity.xCoord = ca._x;
 			ca.activity.yCoord = ca._y;
 			
+			
 			//refresh the transitions
 			//TODO: refresh the transitions as you drag...
 			var myTransitions = _canvasModel.getCanvas().ddm.getTransitionsForActivityUIID(ca.activity.activityUIID);
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -rd38ff02ae0bd4078ec264eaf51f1d406956169b6 -r2c5294a0e44d4480a6ea15db6f6b552c15bccaa8
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision d38ff02ae0bd4078ec264eaf51f1d406956169b6)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 2c5294a0e44d4480a6ea15db6f6b552c15bccaa8)
@@ -234,16 +234,16 @@
 		}else {
 			Debugger.log ('SingleClicking:+' + this, Debugger.GEN, 'localOnPress', 'CanvasOptionalActivity');
 			_doubleClicking = false;
-			_canvasController.activityClick (this);
+			_canvasController.activityClick(this);
 		}
 		_dcStartTime = now;
 	}
 	
 	
 	private function localOnRelease ():Void{
 		Debugger.log ('_doubleClicking:' + _doubleClicking + ', localOnRelease:' + this, Debugger.GEN, 'localOnRelease', 'CanvasOptionalActivity');
-		if (! _doubleClicking)	{
-				_canvasController.activityRelease (this);
+		if (!_doubleClicking)	{
+			_canvasController.activityRelease(this);
 		}
 	}
 	
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -raf56fcac98c65a66e69f7007a0bc23c055a6e41c -r2c5294a0e44d4480a6ea15db6f6b552c15bccaa8
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision af56fcac98c65a66e69f7007a0bc23c055a6e41c)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 2c5294a0e44d4480a6ea15db6f6b552c15bccaa8)
@@ -262,7 +262,7 @@
 	private function localOnRelease():Void{
 		Debugger.log('_doubleClicking:'+_doubleClicking+', localOnRelease:'+this,Debugger.GEN,'localOnRelease','CanvasParallelActivity');
 		if ( ! _doubleClicking)	{
-				_canvasController.activityRelease (this);
+				_canvasController.activityRelease(this);
 		}
 		
 	}