Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r26f461d8762793126c0e8446a82ac831ae0c3619 -r7cfc9d0e5f49c103cf764ae49cb902e5d3d33476
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r26f461d8762793126c0e8446a82ac831ae0c3619 -r7cfc9d0e5f49c103cf764ae49cb902e5d3d33476
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r6450bf811708b24965f20e3208ecd96a71d73155 -r7cfc9d0e5f49c103cf764ae49cb902e5d3d33476
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 6450bf811708b24965f20e3208ecd96a71d73155)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 7cfc9d0e5f49c103cf764ae49cb902e5d3d33476)
@@ -359,11 +359,13 @@
 				showGeneralInfo(false);
 				showAppliedGroupingControls(false);
 				checkEnableOptionalControls(!a.readOnly);
-				populateGroupingProperties(GroupingActivity(caco));
+				//populateGroupingProperties(GroupingActivity(caco));
 				showAppliedGroupingProperties(caco);
 				showOptionalActivityProperties(caco);
 				
 			} else if(a.isParallelActivity()) {
+				var co = (cm.selectedItem instanceof CanvasParallelActivity) ? CanvasParallelActivity(cm.selectedItem) : CanvasActivity(cm.selectedItem);
+				var cca:ComplexActivity = ComplexActivity(co.activity);
 				
 				showOptionalControls(false);
 				showGeneralControls(true, !a.readOnly);
@@ -373,9 +375,9 @@
 				showToolActivityControls(false);
 				showGateControls(false);
 				showAppliedGroupingControls(true, !a.readOnly);
-				populateGroupingProperties(GroupingActivity(cacp));
-				showAppliedGroupingProperties(cacp);
-				showParallelActivityProperties(cacp);
+				//populateGroupingProperties(GroupingActivity(cacp));
+				showAppliedGroupingProperties(cca);
+				showParallelActivityProperties(cca);
 				
 			} else {
 				showOptionalControls(false);