Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r939df762e2d7012ba7479f85635eca990492aded -r5effee713a943c629068d1355be42531ba8ce88c
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 939df762e2d7012ba7479f85635eca990492aded)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 5effee713a943c629068d1355be42531ba8ce88c)
@@ -367,8 +367,8 @@
 	public function addParentToActivity(parentID, ca:Object){
 		ca.activity.parentUIID = parentID;
 		Debugger.log('ParentId of '+ca.activity.activityUIID+ 'Is : '+ca.activity.parentUIID,Debugger.GEN,'addActivityToTransition','CanvasModel');
-		removeActivity(parentID);
 		removeActivity(ca.activity.activityUIID);
+		removeActivity(parentID);
 		setDirty();
 		//var lengthOfChildren:Array = _cv.ddm.getComplexActivityChildren(parentID);
 		//trace("No. of Chlidren in Optional Activity "+parentID+" is: "+lengthOfChildren.length)
@@ -390,8 +390,7 @@
 		ca.activity.parentUIID = null;
 		ca.activity.orderID = null;
 		removeActivity(ca.activity.activityUIID);
-		_cv.ddm.removeActivity(ca.activity.activityUIID);
-		//optionalCA.removeChild();
+		//_cv.ddm.removeActivity(ca.activity.activityUIID);
 		removeActivity(parentID);
 		setDirty();