Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rf529b671aab92c3a3ac9d7aff0a435a71060ff61 -rc99ac4e72ae3c8db8627c38f7e31afd0f6e469d8
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rf529b671aab92c3a3ac9d7aff0a435a71060ff61 -rc99ac4e72ae3c8db8627c38f7e31afd0f6e469d8
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
===================================================================
diff -u -ra88211844dbfb8e302fc327caf6327c894cafbcf -rc99ac4e72ae3c8db8627c38f7e31afd0f6e469d8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision a88211844dbfb8e302fc327caf6327c894cafbcf)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision c99ac4e72ae3c8db8627c38f7e31afd0f6e469d8)
@@ -775,4 +775,17 @@
 	public function set stopAfterActivity(a:Boolean):Void {
 		_stopAfterActivity = a;
 	}
+	
+	public function getDictionaryLabel():String {
+		if(isParallelActivity())
+			return "pi_parallel_title";
+		else if(isOptionalActivity())
+			return "opt_activity_title";
+		else if(isBranchingActivity() || isSequenceActivity())
+			return "pi_activity_type_branching";
+		else if(isGroupActivity())
+			return "pi_activity_type_grouping";
+		else
+			return null;
+	}
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rf529b671aab92c3a3ac9d7aff0a435a71060ff61 -rc99ac4e72ae3c8db8627c38f7e31afd0f6e469d8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision f529b671aab92c3a3ac9d7aff0a435a71060ff61)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision c99ac4e72ae3c8db8627c38f7e31afd0f6e469d8)
@@ -653,31 +653,33 @@
 		}
 	}
  
-	private function isActivityProtected(ca:Object, message:String):Boolean {
+	private function isActivityProtected(ca:Object, message:String, type:String):Boolean {
 		var activity:Activity = Activity(ca.activity);
 		if(activity.isOptionalActivity() || activity.isParallelActivity()) {
 				for(var i=0; i<ca.children.length; i++)
-					if(isActivityProtected(ca.children[i], "cv_activityProtected_complex_child_msg")) return true;
+					if(isActivityProtected(ca.children[i], "cv_activityProtected_child_activity_link_msg", activity.getDictionaryLabel())) return true;
 		} else if(activity.isBranchingActivity() || activity.isSequenceActivity()) {
 			var childrenActs:Array = _canvasModel.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID);
 			for(var i=0; i<childrenActs.length; i++)
-				if(isActivityProtected(ca.children[i], "cv_activityProtected_complex_child_msg")) return true;
+				if(isActivityProtected(ca.children[i], "cv_activityProtected_child_activity_link_msg", activity.getDictionaryLabel())) return true;
 		} else if(activity.isGroupActivity()) {
 			var gActs:Array = _canvasModel.getCanvas().ddm.getActivitiesByType(Activity.GROUP_BRANCHING_ACTIVITY_TYPE)
-				for(var i=0; i<gActs.length; i++) {
-					if(gActs[i].groupingUIID == activity.activityUIID) {
-						if(message == null) message = "cv_activityProtected_grouping_msg";
-						LFMessage.showMessageAlert(Dictionary.getValue(message), null);
-						return true;
-					}
+				
+			for(var i=0; i<gActs.length; i++) {
+				if(gActs[i].groupingUIID == GroupingActivity(activity).createGroupingUIID) {
+					if(message == null) message = "cv_activityProtected_activity_link_msg";
+					LFMessage.showMessageAlert(Dictionary.getValue(message, [Dictionary.getValue(activity.getDictionaryLabel()), Dictionary.getValue("pi_activity_type_branching")]) + " " + Dictionary.getValue("cv_activityProtected_activity_remove_msg", [Dictionary.getValue("grouping_act_title")]), null);
+					return true;
 				}
+			}
 		} else {
 			var tActs:Array = _canvasModel.getCanvas().ddm.getActivitiesByType(Activity.TOOL_BRANCHING_ACTIVITY_TYPE)
 			
 			for(var i=0; i<tActs.length; i++) {
 				if(tActs[i].toolActivityUIID == activity.activityUIID) {
-					if(message == null) message = "cv_activityProtected_tool_msg";
-					LFMessage.showMessageAlert(Dictionary.getValue(message), null);
+					if(message == null) message = "cv_activityProtected_activity_link_msg";
+					if(type == null) type = "ld_val_activity_column";
+					LFMessage.showMessageAlert(Dictionary.getValue(message, [Dictionary.getValue(type), Dictionary.getValue("pi_activity_type_branching")]) + " " + Dictionary.getValue("cv_activityProtected_activity_remove_msg", [Dictionary.getValue("pi_branch_tool_acts_lbl")]), null);
 					return true;
 				}
 			}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -r245728d04c9feab340685e9d94b5623e0f9a1d74 -rc99ac4e72ae3c8db8627c38f7e31afd0f6e469d8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision c99ac4e72ae3c8db8627c38f7e31afd0f6e469d8)
@@ -364,7 +364,11 @@
 	 */
 	public function get actChildren():Array {
 		return _children;
-	} 
+	} 
+	
+	public function get children():Array {
+		return new Array(child1_mc, child2_mc);
+	}
 
 
 }
\ No newline at end of file