Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r470696c2086c615574772b1e4bf8700ad33b5edf -re018e13ac3db92068eca23389f8d2b23edcb647e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 470696c2086c615574772b1e4bf8700ad33b5edf)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision e018e13ac3db92068eca23389f8d2b23edcb647e)
@@ -398,9 +398,9 @@
 	 * @usage   
 	 * @return  
 	 */
-	public function getDesignForSaving():Object{
+	public function getDesignForSaving(isCopy:Boolean):Object{
 		prepareDesignForSaving();
-		return toData();
+		return toData(isCopy);
 	}
 	
 	public function getDesignForAutoSave():Object{
@@ -430,9 +430,8 @@
 	 * @usage   
 	 * @return  
 	 */
-	public function toData():Object{
+	public function toData(isCopy:Boolean):Object{
 		var design:Object = new Object();
-		
 		//if null, use default
 		
 		//TODO: get this sorted - query string
@@ -508,7 +507,7 @@
 		if(classActs.length > 0){
 			
 			for(var i=0; i<classActs.length; i++){
-				design.activities[i] = classActs[i].toData();
+				design.activities[i] = classActs[i].toData(isCopy);
 			}
 		}
 		
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
diff -u -rd423a4b17582eded7b47569aae9db70ed4f5ba8c -re018e13ac3db92068eca23389f8d2b23edcb647e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision d423a4b17582eded7b47569aae9db70ed4f5ba8c)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision e018e13ac3db92068eca23389f8d2b23edcb647e)
@@ -162,16 +162,17 @@
 	
 	//to data for serialising:
 	
-	public function toData():Object{
+	public function toData(isCopy:Boolean):Object{
 		var dto = super.toData();
 		dto.authoringURL = (_authoringURL) ?  _authoringURL : Config.STRING_NULL_VALUE;	
 		dto.toolDisplayName = (_toolDisplayName) ?  _toolDisplayName: Config.STRING_NULL_VALUE;	
+		if(isCopy) { Application.getInstance().getCanvas().getCanvasModel().setDefaultToolContentID(this); }
+		
 		dto.toolContentID = (_toolContentID) ?  _toolContentID: Config.NUMERIC_NULL_VALUE;	
+		
 		dto.toolID = (_toolID) ?  _toolID: Config.NUMERIC_NULL_VALUE;	
 		
-	
 		
-		
 		/* THESE are internal flags, not part of the design
 		dto.supportsContribute = (_supportsContribute!=null) ?  _supportsContribute: Config.BOOLEAN_NULL_VALUE;	
 		dto.supportsDefineLater = (_supportsDefineLater!=null) ?  _supportsDefineLater: Config.BOOLEAN_NULL_VALUE;	
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -raf1ff8086feda412e979a914b171dabb310838bc -re018e13ac3db92068eca23389f8d2b23edcb647e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision af1ff8086feda412e979a914b171dabb310838bc)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision e018e13ac3db92068eca23389f8d2b23edcb647e)
@@ -328,6 +328,7 @@
 		//clear the learningDesignID so it will not overwrite the existing one
 		_ddm.learningDesignID = null;
 		
+		
         var onOkCallback:Function = Proxy.create(this, saveDesignToServer);
 		var ws = Application.getInstance().getWorkspace();
         ws.setDesignProperties("LOCATION",onOkCallback);
@@ -349,6 +350,7 @@
 	 */
 	public function saveDesignToServer(workspaceResultDTO:Object):Boolean{
 		_global.breakpoint();
+		var isCopy:Boolean = false;
 		//TODO: Set the results from wsp into design.
 		if(workspaceResultDTO != null){
 			if(workspaceResultDTO.selectedResourceID != null){
@@ -362,9 +364,9 @@
 			_ddm.licenseID = workspaceResultDTO.resourceLicenseID;
 		}
 		
+		if(_ddm.learningDesignID == null) { isCopy = true; }
+		var dto:Object = _ddm.getDesignForSaving(isCopy);
 		
-		var dto:Object = _ddm.getDesignForSaving();
-		
 		var callback:Function = Proxy.create(this,onStoreDesignResponse);
 		
 		Application.getInstance().getComms().sendAndReceive(dto,"authoring/storeLearningDesignDetails",callback,false);
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -raa12504abe126b44774d350a217b2119171aa90e -re018e13ac3db92068eca23389f8d2b23edcb647e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision aa12504abe126b44774d350a217b2119171aa90e)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision e018e13ac3db92068eca23389f8d2b23edcb647e)
@@ -880,8 +880,13 @@
 		openToolActivityContent(ta);
 	}
 	
+	public function setDefaultToolContentID(ta:ToolActivity):Void{
+		ta.toolContentID = Application.getInstance().getToolkit().getDefaultContentID(ta.toolContentID,ta.toolID);
+		Debugger.log('ta:'+ta.title+',toolContentID:'+ta.toolContentID+', activityUIID:'+ta.activityUIID,Debugger.GEN,'setDefaultToolContentID','CanvasModel');
+	}
 	
 	
+	
 	/**
     * Notify registered listeners that a data model change has happened
     */
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rb9181d6d69554bbf3301e631fc43b1919d77f61a -re018e13ac3db92068eca23389f8d2b23edcb647e
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rb9181d6d69554bbf3301e631fc43b1919d77f61a -re018e13ac3db92068eca23389f8d2b23edcb647e
Binary files differ