Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -rcfcb442c1d5f190eabeea2851a0d97103be193cd -r50760c5c669bd3fd10d3539e74a22a5f12aad539
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision cfcb442c1d5f190eabeea2851a0d97103be193cd)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 50760c5c669bd3fd10d3539e74a22a5f12aad539)
@@ -271,9 +271,12 @@
 				_activities.put(newToolActivity.activityUIID,newToolActivity);
 			
 			//}else if(dto.objectType == "ComplexActivity"){
-			}else if(dto.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
-				//TODO: Optional activity
-				
+			}else if(dto.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || dto.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
+				//TODO: Test this!
+				var cAct:ComplexActivity= new ComplexActivity(dto.activityUIID);
+				cAct.populateFromDTO(dto);				
+				_activities.put(cAct.activityUIID,cAct);
+					
 			}else if(dto.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){
 				//TODO: Test this code when we are able to save and then open a design with grouping
 				var newGroupActiviy:GroupingActivity = new GroupingActivity(dto.activityUIID);