Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.449 -r1.450
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v
diff -u -r1.349 -r1.350
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as,v
diff -u -r1.86 -r1.87
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	4 Apr 2008 02:56:59 -0000	1.86
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	6 Jun 2008 05:24:52 -0000	1.87
@@ -378,8 +378,10 @@
 		}
 		
 		
-		if(defaultSequenceActivity == null)
-			createInitialSequenceActivity(sequenceActs.length+1);
+		if(defaultSequenceActivity == null) {
+			var orderID:Number = model.getHighestBranchNumber(activity.activityUIID);
+			createInitialSequenceActivity(orderID+1);
+		}
 		
 		model.haltRefresh(false);
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as,v
diff -u -r1.76 -r1.77
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	28 Apr 2008 05:49:54 -0000	1.76
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	6 Jun 2008 05:24:52 -0000	1.77
@@ -771,16 +771,46 @@
 			//b.setDefaultSequenceName();
 			
 			sequences.sortOn("orderID", Array.NUMERIC);
-			var orderID:Number = (sequences.length > 0) ? sequences[sequences.length-1].orderID : 0;
 			
+			var orderID:Number = (sequences.length > 0) ? getHighestBranchNumber(b.sequenceActivity.parentUIID) : 0;
 			Debugger.log("sequences length (order id): " + orderID, Debugger.CRITICAL, "createBranchStartConnector", "CanvasModel");
 			
 			createNewSequenceActivity(activeView.activity, orderID+1, null, true);
 			
 			return b;
 		}
 	}
+	
+	/**
+	 * @usage gets the highest branch number for the current branching activities
+	 * @param   
+	 * @return  
+	 */
+	public function getHighestBranchNumber(branchParentUIID:Number):Number {
+		
+		var sequences:Array = _cv.ddm.getComplexActivityChildren(branchParentUIID);
+		var highestNum:Number = 0;
+		
+		for (var i=0; i<sequences.length; ++i) {
 
+			var title:String = sequences[i].title;
+			
+			var branchNum = 0;
+			if (title.substring(0,Dictionary.getValue('branch_mapping_dlg_branch_col_lbl').length) == Dictionary.getValue('branch_mapping_dlg_branch_col_lbl')) {
+				branchNum = Number(title.substr(Dictionary.getValue('branch_mapping_dlg_branch_col_lbl').length + 1));
+			}
+			
+			if (isNaN(Number(branchNum))) branchNum = 0;
+			
+			if (branchNum > highestNum) {	
+				highestNum = branchNum;
+			}
+		}
+
+		return highestNum;
+	}
+
+
 	/**
 	 * @usage   
 	 * @param   transitionActs An array of transition activities. Must only contain 2
@@ -824,7 +854,7 @@
 		//b.setDefaultSequenceName();
 			
 		sequences.sortOn("orderID", Array.NUMERIC);
-		var orderID:Number = (sequences.length > 0) ? sequences[sequences.length-1].orderID : 0;
+		var orderID:Number = (sequences.length > 0) ? getHighestBranchNumber(b.sequenceActivity.parentUIID) : 0;
 		
 		Debugger.log("orderID: " + orderID, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel");