Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r712d6bf4194c9a9dbdc67b739fbb2fcbcf2711f1 -r502e88647db22fac6375117685082590023dd682
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r712d6bf4194c9a9dbdc67b739fbb2fcbcf2711f1 -r502e88647db22fac6375117685082590023dd682
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
===================================================================
diff -u -ra8c2b049ede9a3547e87cd943a4b63add2e00eae -r502e88647db22fac6375117685082590023dd682
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision a8c2b049ede9a3547e87cd943a4b63add2e00eae)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision 502e88647db22fac6375117685082590023dd682)
@@ -23,7 +23,7 @@
 
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.Config;
-import org.lamsfoundation.lams.common.util.Debugger;
+import org.lamsfoundation.lams.common.util.Debugger;
 
 /**
  *
@@ -103,7 +103,7 @@
 	}
 	
 	public function populateFromDTO(dto:Object):Void {
-		_conditionID = dto.conditionID;
+		_conditionID = dto.conditionId;
 		_conditionUIID = dto.conditionUIID;
 		
 		_orderID = dto.orderID;
@@ -116,9 +116,9 @@
 	}
 	
 	public function toData():Object {
-		var dto:Object = new Object();
+		var dto:Object = new Object();
 		
-		if(_conditionID) dto.conditionID = conditionID;
+		if(_conditionID) dto.conditionId = conditionID;
 		if(_conditionUIID) dto.conditionUIID = _conditionUIID;
 		
 		if(_orderID) dto.orderID = _orderID;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as
===================================================================
diff -u -r0da30c6fad9b5b07eaac3524dff5ca060195860b -r502e88647db22fac6375117685082590023dd682
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as	(.../ToolOutputDefinition.as)	(revision 0da30c6fad9b5b07eaac3524dff5ca060195860b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as	(.../ToolOutputDefinition.as)	(revision 502e88647db22fac6375117685082590023dd682)
@@ -33,12 +33,14 @@
 	public static var LONG:String = "OUTPUT_LONG";
 	public static var BOOL:String = "OUTPUT_BOOLEAN";
 	public static var USER_DEFINED:String = "OUTPUT_SET_BOOLEAN";
+	public static var COMPLEX:String = "OUTPUT_COMPLEX";
 	
 	private var _name:String;
 	private var _description:String;
 	private var _type:String;
 	private var _startValue:Object;
 	private var _endValue:Object;
+	private var _complexDefinition:Object;
 	private var _defaultConditions:Array;
 	private var _showConditionNameOnly:Boolean;
 	
@@ -117,6 +119,10 @@
 		return _endValue;
 	}
 	
+	public function get complexDefinition():Object {
+		return _complexDefinition;
+	}
+	
 	public function get defaultConditions():Array {
 		return _defaultConditions;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r502e88647db22fac6375117685082590023dd682
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 5b44cd0646c0ee06e57059948a5d5f730040f431)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 502e88647db22fac6375117685082590023dd682)
@@ -161,9 +161,11 @@
 		//work out offsets from bottom RHS of panel
         xOkOffset = _bgpanel._width - close_btn._x;
         yOkOffset = _bgpanel._height - close_btn._y;
+		
+		_condition_item_dgd.selectable = false;
 		
 		 //Register as listener with StyleManager and set Styles
-        themeManager.addEventListener('themeChanged',this);
+        themeManager.addEventListener('themeChanged',this);
 		
 		setLabels();
         setStyles();
@@ -323,6 +325,8 @@
 				_toolOutputDefin_cmb.selectedIndex = i;
 			else if(items[i].type == ToolOutputDefinition.USER_DEFINED && name.substring(0, name.indexOf(DEFINITION_DELIMITER)) == items[i].name)
 				_toolOutputDefin_cmb.selectedIndex = i;
+			else if(items[i].type == ToolOutputDefinition.COMPLEX && name.substring(0, name.indexOf(DEFINITION_DELIMITER)) == items[i].name) // TODO: CHECK
+				_toolOutputDefin_cmb.selectedIndex = i;
 
 	}
 	
@@ -406,11 +410,14 @@
 					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_min", [String(condition.endValue)]), data: condition, orderID: condition.orderID});
 				else
 					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_exact", [String(condition.exactMatchValue)]), data: condition, orderID: condition.orderID});
-				
 				break;
+				
 			case ToolOutputDefinition.BOOL: 
 				_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition, orderID: condition.orderID});
 				break;
+			case ToolOutputDefinition.COMPLEX:
+				_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition, orderID: condition.orderID});
+				break;	
 			case ToolOutputDefinition.USER_DEFINED:
 				_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition, orderID: condition.orderID});
 				break;
@@ -461,6 +468,8 @@
 				break;
 			case ToolOutputDefinition.BOOL:
 				return true;
+			case ToolOutputDefinition.COMPLEX:
+				return true;
 			case ToolOutputDefinition.USER_DEFINED:
 				return true;
 			default: 
@@ -531,8 +540,8 @@
 		
 		if(app.getCanvas().ddm.hasBranchMappingsForConditionSet(_condition_item_dgd.dataProvider) && evt != null && _toolOutputDefin_cmb.selectedIndex != 0) {
 			LFMessage.showMessageConfirm(Dictionary.getValue("branch_mapping_dlg_condition_linked_msg", [Dictionary.getValue("branch_mapping_dlg_condition_linked_all")]), Proxy.create(this, removeAllItems, true), Proxy.create(this, returnDefinitionState), Dictionary.getValue("al_continue"), null);
-		} else if(evt != null) removeAllItems(true);
-		else selectDefinition();
+		} else if(evt != null) removeAllItems(true);
+		else selectDefinition();
 			
 	}
 	
@@ -627,6 +636,19 @@
 				addDefaultConditions(_selectedDefinition.defaultConditions);
 				
 				break;
+			case ToolOutputDefinition.COMPLEX:
+				_condition_item_dgd.visible = true;
+				_toolOutputLongOptions_cmb.visible = false;
+				add_btn.visible = false;
+				remove_item_btn.visible = false;
+				clear_all_btn.visible = false;
+				
+				refresh_btn.visible = true;
+				
+				showSteppers(false, false);
+				
+				addDefaultConditions(_selectedDefinition.defaultConditions); // _selectedDefinition object the same when working/not working
+				break;
 			case ToolOutputDefinition.USER_DEFINED:
 				_condition_item_dgd.visible = true;
 				_toolOutputLongOptions_cmb.visible = false;
@@ -723,6 +745,9 @@
 			case ToolOutputDefinition.BOOL:
 				return Dictionary.getValue("to_conditions_dlg_defin_bool_type");
 				break;
+			case ToolOutputDefinition.COMPLEX:
+				return Dictionary.getValue("to_conditions_dlg_defin_complex_type");
+				break;
 			case ToolOutputDefinition.LONG:
 				return Dictionary.getValue("to_conditions_dlg_defin_long_type");
 				break;