Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rfe232584cdc0697b18352afeb9ff46eab0dc856a -r7ebecb967699a51f248699d35e142cc22bdd7cca
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rfe232584cdc0697b18352afeb9ff46eab0dc856a -r7ebecb967699a51f248699d35e142cc22bdd7cca
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -rdee8f3e886e170f502a05d559769c4fff6cdf291 -r7ebecb967699a51f248699d35e142cc22bdd7cca
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision dee8f3e886e170f502a05d559769c4fff6cdf291)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 7ebecb967699a51f248699d35e142cc22bdd7cca)
@@ -488,32 +488,46 @@
 			var o = ComplexActivity(oa);
 			
 			if(o.noSequences < noSeqAct_cmb.value) {
-				for(var i=0; i<(noSeqAct_cmb.value - o.noSequences); i++)
-					_canvasModel.createNewSequenceActivity(oa, o.noSequences+(i-1));
-					
-				_canvasModel.setDirty();
+				addSequenceItems(oa, Number(noSeqAct_cmb.value - o.noSequences));
 			} else {
 				var itemsToRemove:Array = CanvasOptionalActivity(_canvasModel.selectedItem).getLastItems((o.noSequences - noSeqAct_cmb.value));
-				Debugger.log("itemsToRemove len: " + itemsToRemove.length,Debugger.CRITICAL, "updateOptionalSequenceData", "PropertyInspector");
-				
-				for(var i=0; i<itemsToRemove.length; i++)
-					_canvasModel.getCanvas().ddm.removeActivity(itemsToRemove[i]);
-				
-				_canvasModel.setDirty();
+				removeSequenceItems(itemsToRemove);
 			}
 			
-			this.onEnterFrame = onUpdateOptionalSequenceData;
 		}
 	}
 	
+	private function removeSequenceItems(itemsToRemove, overwrite:Boolean):Void {
+		for(var i=0; i<itemsToRemove.length; i++) {
+					if(_canvasModel.getCanvas().ddm.getComplexActivityChildren(itemsToRemove[i]).length > 0 && !overwrite) {
+						LFMessage.showMessageConfirm(Dictionary.getValue('pi_optSequence_remove_msg'), Proxy.create(this, removeSequenceItems, itemsToRemove, true), null, null, null, Dictionary.getValue('pi_optSequence_remove_msg_title'));
+					} else { 
+						_canvasModel.getCanvas().ddm.removeActivity(itemsToRemove[i]); 
+					}
+		}
+		
+		_canvasModel.setDirty();
+		this.onEnterFrame = onUpdateOptionalSequenceData;
+	}
+	
+	private function addSequenceItems(oa:Activity, count:Number):Void {
+		var o = ComplexActivity(oa);
+		
+		for(var i=0; i<count; i++)
+			_canvasModel.createNewSequenceActivity(oa, o.noSequences+(i-1));
+					
+		_canvasModel.setDirty();
+		this.onEnterFrame = onUpdateOptionalSequenceData;
+	}
+	
 	private function onUpdateOptionalSequenceData() {
 		delete this.onEnterFrame;
 		
 		var newChildren:Array = _canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID);
 		CanvasOptionalActivity(_canvasModel.selectedItem).updateChildren(newChildren);
 		
 		setModified();
-	
+		noSeqAct_cmb.selectedIndex = newChildren.length;
 		_canvasModel.activeView.getController().clearBusy()	
 			
 	}