Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rdd43d4780be9412a87a66fa47a56619377e4a897 -redfb806aa366570610c9306a5f5c54f33d37c76b
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rdd43d4780be9412a87a66fa47a56619377e4a897 -redfb806aa366570610c9306a5f5c54f33d37c76b
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -reedece3b6554bd6c2bc28d6c7e32d7bdece08040 -redfb806aa366570610c9306a5f5c54f33d37c76b
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision eedece3b6554bd6c2bc28d6c7e32d7bdece08040)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision edfb806aa366570610c9306a5f5c54f33d37c76b)
@@ -1010,13 +1010,16 @@
 		
 		myMappings.groupBased = new Array();
 		myMappings.toolBased = new Array();
+		myMappings.choosenBased = new Array();
 		myMappings.uncategorised = new Array();
 		myMappings.all = new Array();
 		
 		for(var i=0; i<bMappings.length; i++)
 			if(bMappings[i].branchingActivity.activityUIID == activityUIID || bMappings[i].sequenceActivity.activityUIID == activityUIID) {
-				if(bMappings[i] instanceof GroupBranchActivityEntry)	
+				if(bMappings[i] instanceof GroupBranchActivityEntry &&  bMappings[i].branchingActivity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE)	
 					myMappings.groupBased.push(bMappings[i]);
+				else if(bMappings[i] instanceof GroupBranchActivityEntry &&  bMappings[i].branchingActivity.activityTypeID == Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE)
+					myMappings.choosenBased.push(bMappings[i]);
 				else if(bMappings[i] instanceof ToolOutputBranchActivityEntry)
 					myMappings.toolBased.push(bMappings[i]);
 				else 
@@ -1175,10 +1178,13 @@
 			
 			Debugger.log("gacts mappings len tool:" + mappings.toolBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
 			Debugger.log("gacts mappings len group:" + mappings.groupBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+			Debugger.log("gacts mappings len choosen:" + mappings.choosenBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
 			
 			if(mappings.toolBased.length > 0)
 				mappingsToRemove.push(Array(mappings.toolBased));
 
+			if(mappings.choosenBased.length > 0)
+				mappingsToRemove.push(Array(mappings.choosenBased));
 			
 			for(var j=0; j<mappings.groupBased.length; j++)
 				if(mappings.groupBased[j].group.parentID != BranchingActivity(gActs[i]).groupingUIID)
@@ -1191,10 +1197,14 @@
 			
 			Debugger.log("tacts mappings len tool:" + mappings.toolBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
 			Debugger.log("tacts mappings len group:" + mappings.groupBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+			Debugger.log("tacts mappings len choosen:" + mappings.choosenBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
 			
 			if(mappings.groupBased.length > 0)
 				mappingsToRemove.push(Array(mappings.groupBased));
 			
+			if(mappings.choosenBased.length > 0)
+				mappingsToRemove.push(Array(mappings.choosenBased));
+				
 			for(var j=0; j<mappings.toolBased.length; j++)
 				if(mappings.toolBased[j].condition.toolActivity.activityUIID != BranchingActivity(tActs[i]).toolActivityUIID &&
 					mappings.toolBased[j].condition.branchingActivity.activityUIID == BranchingActivity(tActs[i]).activityUIID)