Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -re21e46d35a751657ff3b63704419ad212747425e -r2e8644b7159adf3a842b1c622ccbb8a51136e18a
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision e21e46d35a751657ff3b63704419ad212747425e)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 2e8644b7159adf3a842b1c622ccbb8a51136e18a)
@@ -299,6 +299,8 @@
 		
 		_licenseID = design.licenseID;
 		_licenseText = design.licenseText;
+			
+		_contentFolderID = design.contentFolderID;
 		
 		//set the activities in the hash table
 		for(var i=0; i<design.activities.length;i++){
@@ -501,6 +503,7 @@
 		if(_createDateTime){	design.createDateTime 	= _createDateTime;		}
 		if(_lastModifiedDateTime){ design.lastModifiedDateTime = _lastModifiedDateTime;	}
 		if(_dateReadOnly){		design.dateReadOnly		= _dateReadOnly;		}
+		if(_contentFolderID){	design.contentFolderID 	= _contentFolderID;		}
 		
 		if(_autoSaved) { 		design.autoSaved 		= _autoSaved 					}
 		
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -re21e46d35a751657ff3b63704419ad212747425e -r2e8644b7159adf3a842b1c622ccbb8a51136e18a
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision e21e46d35a751657ff3b63704419ad212747425e)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 2e8644b7159adf3a842b1c622ccbb8a51136e18a)
@@ -168,9 +168,10 @@
 					canvasModel.autoSaveWait = true;
 				}
 				setInterval(Proxy.create(this,autoSave), autosave_config_interval);
-				
 			}
 			
+			clearCanvas(true);
+			
             dispatchEvent({type:'load',target:this});
         }else {
             Debugger.log('Event type not recognised : ' + evt.type,Debugger.CRITICAL,'viewLoaded','Canvas');
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r9e84218c2f5bd8ad6090f1f3cd6a90a5edfe5083 -r2e8644b7159adf3a842b1c622ccbb8a51136e18a
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 9e84218c2f5bd8ad6090f1f3cd6a90a5edfe5083)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 2e8644b7159adf3a842b1c622ccbb8a51136e18a)
@@ -843,13 +843,14 @@
 			if(ta.toolContentID > 0){
 				var url:String;
 				var cfg = Config.getInstance();
+				var ddm = _cv.ddm;
 				if(ta.authoringURL.indexOf("?") != -1){
 					//09-11-05 Change to toolContentID and remove userID.
 					//url = cfg.serverUrl+ta.authoringURL + '&toolContentId='+ta.toolContentID+'&userID='+cfg.userID;
-					url = cfg.serverUrl+ta.authoringURL + '&toolContentID='+ta.toolContentID;
+					url = cfg.serverUrl+ta.authoringURL + '&toolContentID='+ta.toolContentID+'&contentFolderID='+ddm.contentFolderID;
 				}else{
 					//url = cfg.serverUrl+ta.authoringURL + '?toolContentId='+ta.toolContentID+'&userID='+cfg.userID;
-					url = cfg.serverUrl+ta.authoringURL + '?toolContentID='+ta.toolContentID;
+					url = cfg.serverUrl+ta.authoringURL + '?toolContentID='+ta.toolContentID+'&contentFolderID='+ddm.contentFolderID;
 				}
 			
 				Debugger.log('Opening url:'+url,Debugger.GEN,'openToolActivityContent','CanvasModel');
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -re21e46d35a751657ff3b63704419ad212747425e -r2e8644b7159adf3a842b1c622ccbb8a51136e18a
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -re21e46d35a751657ff3b63704419ad212747425e -r2e8644b7159adf3a842b1c622ccbb8a51136e18a
Binary files differ