Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r40c79808bd63b95f1df496587488e8c09594f1a5 -rac25d66ce383abbc5adee72515d310bdd4178097
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r40c79808bd63b95f1df496587488e8c09594f1a5 -rac25d66ce383abbc5adee72515d310bdd4178097
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
diff -u -rfdaecf1d872c9a4ef732a7bd918f2edbc52767b4 -rac25d66ce383abbc5adee72515d310bdd4178097
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision fdaecf1d872c9a4ef732a7bd918f2edbc52767b4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision ac25d66ce383abbc5adee72515d310bdd4178097)
@@ -162,7 +162,7 @@
 			//TODO: Have the backend send this to flash for all tool activities in the design on startup
 			if(!StringUtils.isWDDXNull(dto.toolOutputDefinitions)) {
 				for (var i=0; i<dto.toolOutputDefinitions.length; i++) {
-					addDefinition(dto.toolOutputDefinitions[i]);
+					addOrUpdateDefinition(dto.toolOutputDefinitions[i]);
 				}
 			}
 			
@@ -266,7 +266,7 @@
 		var numDefinitions:Number = definitions.length;
 		if (numDefinitions > 0) {
 			for (var i=0; i<numDefinitions; i++) {
-				n.addDefinition(definitions[i]);
+				n.addOrUpdateDefinition(definitions[i]);
 			}
 		}
 		
@@ -287,10 +287,12 @@
 		}
 	}
 	
-	public function addDefinition(dto:Object):Void {
-		if (!_toolOutputDefinitions.containsKey(dto.name)) {
-			_toolOutputDefinitions.put(dto.name, dto);
+	public function addOrUpdateDefinition(dto:Object):Void {
+		if (_toolOutputDefinitions.containsKey(dto.name)) {
+			_toolOutputDefinitions.remove(dto.name); // necessary in case the tooloutputDefinition's default conditions have changed
+			// update the mappings?
 		}
+		_toolOutputDefinitions.put(dto.name, dto);
 	}
 	
 	public function removeDefinition(key:String):Void {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -rfdaecf1d872c9a4ef732a7bd918f2edbc52767b4 -rac25d66ce383abbc5adee72515d310bdd4178097
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision fdaecf1d872c9a4ef732a7bd918f2edbc52767b4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision ac25d66ce383abbc5adee72515d310bdd4178097)
@@ -665,7 +665,7 @@
 		if(r.length > 0) {
 			for(var i=0; i < r.length; i++) {
 				Debugger.log("adding def: " + r[i].name + " desc: " + r[i].description, Debugger.CRITICAL, "setToolOutputDefinitions", "Canvas");
-				toolActivity.addDefinition(r[i]);
+				toolActivity.addOrUpdateDefinition(r[i]);
 			}
 		}