Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -re56cc7dce08bb4a9c996c596216440807778112e -rcda1896b7cc29065750f10d9a3548c3cc9db3a9d
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision e56cc7dce08bb4a9c996c596216440807778112e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision cda1896b7cc29065750f10d9a3548c3cc9db3a9d)
@@ -308,25 +308,6 @@
 	}
 	
 	/**
-	 * Assign activityID of Optional activity as a parentID to the ca (canvas activity) 
-	 * Which will draw child activities in Parent Optional Activity.
-	 * @usage   
-	 * @param   parentID (ActivityID of Optional Activity where canavas activity has been dropped.)
-	 * @param   ca       (reference of the canvas activity to which parentID is assigned)
-	 * @return  
-	 */
-	public function addParentToActivity(parentID, ca:Object, doRemoveParent:Boolean){
-		ca.activity.parentUIID = parentID;
-		
-		Debugger.log('ParentId of '+ca.activity.activityUIID+ ' ==> '+ca.activity.parentUIID,Debugger.GEN,'addParentToActivity','CanvasModel');
-		
-		removeActivity(ca.activity.activityUIID);
-		if(doRemoveParent) removeActivity(parentID);
-		
-		setDirty();
-	}
-	
-	/**
 	 * Removes the activity from the Canvas Model
 	 * @usage   
 	 * @param   activityUIID 
@@ -524,33 +505,6 @@
 		}
 	}
 	
-	
-	public function removeActivity(activityUIID):Object{
-		//dispatch an event to show the design  has changed
-		
-		var r:Object = _activitiesDisplayed.remove(activityUIID);
-		if(r==null){
-			return new LFError("Removing activity failed:"+activityUIID,"removeActivity",this,null);
-		}else{
-			Debugger.log('Removed:'+r.activityUIID,Debugger.GEN,'removeActivity','DesignDataModel');
-			r.removeMovieClip();
-		}
-	}
-	
-	public function removeActivityOnBin(activityUIID):Object{
-		//dispatch an event to show the design  has changed
-				
-		var r:Object = _activitiesDisplayed.remove(activityUIID);
-		if(r==null){
-			return new LFError("Removing activity failed:"+activityUIID,"removeActivity",this,null);
-		}else{
-			Debugger.log('Removed:'+r.activityUIID,Debugger.GEN,'removeActivity','DesignDataModel');
-				
-			r.removeMovieClip();
-			_cv.removeActivity(activityUIID);
-		}
-	}
-	
 	private function isLoopingLD(fromAct, toAct):Boolean{
 		var toTransitions = _cv.ddm.getTransitionsForActivityUIID(toAct)
 		if (toTransitions.out != null){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -r745cc845b7776b062471723072abb234db21f292 -rcda1896b7cc29065750f10d9a3548c3cc9db3a9d
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 745cc845b7776b062471723072abb234db21f292)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision cda1896b7cc29065750f10d9a3548c3cc9db3a9d)
@@ -900,6 +900,51 @@
 		
 		setSelectedItem(selectedCanvasElement);
 		
+	}
+		
+	public function removeActivity(activityUIID):Object{
+		//dispatch an event to show the design  has changed
+		
+		var r:Object = _activitiesDisplayed.remove(activityUIID);
+		if(r==null){
+			return new LFError("Removing activity failed:"+activityUIID,"removeActivity",this,null);
+		}else{
+			Debugger.log('Removed:'+r.activityUIID,Debugger.GEN,'removeActivity','DesignDataModel');
+			r.removeMovieClip();
+		}
+	}
+	
+	public function removeActivityOnBin(activityUIID):Object{
+		//dispatch an event to show the design  has changed
+				
+		var r:Object = _activitiesDisplayed.remove(activityUIID);
+		if(r==null){
+			return new LFError("Removing activity failed:"+activityUIID,"removeActivity",this,null);
+		}else{
+			Debugger.log('Removed:'+r.activityUIID,Debugger.GEN,'removeActivity','DesignDataModel');
+				
+			r.removeMovieClip();
+			_cv.removeActivity(activityUIID);
+		}
+	}
+		
+	/**
+	 * Assign activityID of Optional activity as a parentID to the ca (canvas activity) 
+	 * Which will draw child activities in Parent Optional Activity.
+	 * @usage   
+	 * @param   parentID (ActivityID of Optional Activity where canavas activity has been dropped.)
+	 * @param   ca       (reference of the canvas activity to which parentID is assigned)
+	 * @return  
+	 */
+	public function addParentToActivity(parentID, ca:Object, doRemoveParent:Boolean){
+		ca.activity.parentUIID = parentID;
+		
+		Debugger.log('ParentId of '+ca.activity.activityUIID+ ' ==> '+ca.activity.parentUIID,Debugger.GEN,'addParentToActivity','CanvasModel');
+		
+		removeActivity(ca.activity.activityUIID);
+		if(doRemoveParent) removeActivity(parentID);
+		
+		setDirty();
 	}
 
 	/**