From 5d867b9cdfc2e6fd82011f16d6c0be6d9740e540 Mon Sep 17 00:00:00 2001
From: merspieler <merspieler@airmail.cc>
Date: Wed, 7 Nov 2018 23:50:30 +0100
Subject: [PATCH 1/2] Made MCDU dimable

Signed-off-by: merspieler <merspieler@airmail.cc>
---
 Models/Instruments/MCDU/MCDU.nas  |    5 +-
 Models/Instruments/MCDU/MCDU1.xml | 1135 +++++++++++++++++++++--------
 Models/Instruments/MCDU/MCDU2.xml | 1135 +++++++++++++++++++++--------
 3 files changed, 1657 insertions(+), 618 deletions(-)

diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas
index 2dde783d..92a3064d 100644
--- a/Models/Instruments/MCDU/MCDU.nas
+++ b/Models/Instruments/MCDU/MCDU.nas
@@ -94,7 +94,7 @@ var canvas_MCDU_base = {
 		"PERFTO_V2","PERFTO_FE","PERFTO_SE","PERFTO_OE"];
 	},
 	update: func() {
-		if (getprop("/systems/electrical/bus/ac1") >= 110) {
+		if (getprop("/systems/electrical/bus/ac1") >= 110 and getprop("/controls/lighting/DU/mcdu1") > 0) {
 			MCDU_1.update();
 			MCDU_1.updateFast();
 			updateL = 1;
@@ -103,7 +103,8 @@ var canvas_MCDU_base = {
 			updateL = 0;
 			MCDU_1.page.hide();
 		}
-		if (getprop("/systems/electrical/bus/ac2") >= 110) {
+		if (getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/controls/lighting/DU/mcdu2") > 0) {
+			MCDU_1.update();
 			MCDU_2.update();
 			MCDU_2.updateFast();
 			updateR = 1;
diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml
index 551db650..6a7112a9 100644
--- a/Models/Instruments/MCDU/MCDU1.xml
+++ b/Models/Instruments/MCDU/MCDU1.xml
@@ -22,6 +22,63 @@
 			</binding>
 		</action>
 	</animation>
+
+	<animation>
+ 		<type>material</type>
+ 		<object-name>mcdu1.screen</object-name>
+ 		<emission>
+ 			<red>1</red>
+ 			<green>1</green>
+ 			<blue>1</blue>
+ 			<factor-prop>controls/lighting/DU/mcdu1</factor-prop>
+ 		</emission>
+ 	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>BRT</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac1</property>
+						<value>110</value>
+					</greater-than-equals>
+				</condition>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/mcdu1</property>
+				<min>0.0</min>
+				<max>1.0</max>
+				<step>0.2</step>
+				<wrap>false</wrap>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>pick</type>
+		<object-name>DIM</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac1</property>
+						<value>110</value>
+					</greater-than-equals>
+				</condition>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/mcdu1</property>
+				<min>0.0</min>
+				<max>1.0</max>
+				<step>-0.2</step>
+				<wrap>false</wrap>
+			</binding>
+		</action>
+	</animation>
 	
 	<animation>
 		<type>pick</type>
@@ -33,10 +90,16 @@
 				<command>nasal</command>
 				<script>mcdu1.pagebutton("radnav");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -52,10 +115,16 @@
 				<command>nasal</command>
 				<script>mcdu1.pagebutton("init");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -71,10 +140,16 @@
 				<command>nasal</command>
 				<script>mcdu1.pagebutton("data");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -90,10 +165,16 @@
 				<command>nasal</command>
 				<script>mcdu1.pagebutton("mcdu");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -109,10 +190,16 @@
 				<command>nasal</command>
 				<script>mcdu1.pagebutton("perf");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -128,10 +215,16 @@
 				<command>nasal</command>
 				<script>mcdu1.pagebutton("f-pln");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -147,10 +240,16 @@
 				<command>nasal</command>
 				<script>mcdu1.pagebutton("fuel-pred");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -166,10 +265,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -180,10 +285,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton_b("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -198,10 +309,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -212,10 +329,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton_b("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -230,10 +353,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -244,10 +373,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton_b("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -262,10 +397,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -276,10 +417,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton_b("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -294,10 +441,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -308,10 +461,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton_b("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -326,10 +485,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -340,10 +505,16 @@
 				<command>nasal</command>
 				<script>mcdu1.lskbutton_b("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -359,10 +530,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -373,10 +550,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton_b("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -391,10 +574,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -405,10 +594,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton_b("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -423,10 +618,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -437,10 +638,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton_b("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -455,10 +662,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -469,10 +682,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton_b("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -487,10 +706,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -501,10 +726,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton_b("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -519,10 +750,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -533,10 +770,16 @@
 				<command>nasal</command>
 				<script>mcdu1.rskbutton_b("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -552,10 +795,16 @@
 				<command>nasal</command>
 				<script>mcdu1.arrowbutton("left");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -570,10 +819,16 @@
 				<command>nasal</command>
 				<script>mcdu1.arrowbutton("right");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -588,10 +843,16 @@
 				<command>nasal</command>
 				<script>mcdu1.arrowbutton("up");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -606,10 +867,16 @@
 				<command>nasal</command>
 				<script>mcdu1.arrowbutton("down");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -625,10 +892,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("A");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -643,10 +916,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("B");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -661,10 +940,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("C");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -679,10 +964,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("D");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -697,10 +988,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("E");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -715,10 +1012,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("F");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -733,10 +1036,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("G");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -751,10 +1060,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("H");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -769,10 +1084,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("I");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -787,10 +1108,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("J");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -805,10 +1132,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("K");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -823,10 +1156,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("L");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -841,10 +1180,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("M");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -859,10 +1204,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("N");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -877,10 +1228,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("O");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -895,10 +1252,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("P");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -913,10 +1276,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("Q");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -931,10 +1300,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("R");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -949,10 +1324,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("S");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -967,10 +1348,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("T");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -985,10 +1372,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("U");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1003,10 +1396,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("V");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1021,10 +1420,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("W");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1039,10 +1444,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("X");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1057,10 +1468,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("Y");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1075,10 +1492,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("Z");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1093,10 +1516,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("SLASH");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1111,10 +1540,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("SP");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1129,10 +1564,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("OVFY");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1147,10 +1588,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("CLR");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1165,10 +1612,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("0");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1183,10 +1636,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1201,10 +1660,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1219,10 +1684,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1237,10 +1708,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1255,10 +1732,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1273,10 +1756,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1291,10 +1780,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("7");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1309,10 +1804,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("8");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1327,10 +1828,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("9");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1345,10 +1852,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("DOT");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1363,10 +1876,16 @@
 				<command>nasal</command>
 				<script>mcdu1.button("PLUSMINUS");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac1</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu1</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml
index 3dfb0167..8ee634e6 100644
--- a/Models/Instruments/MCDU/MCDU2.xml
+++ b/Models/Instruments/MCDU/MCDU2.xml
@@ -22,6 +22,63 @@
 			</binding>
 		</action>
 	</animation>
+
+	<animation>
+ 		<type>material</type>
+ 		<object-name>mcdu2.screen</object-name>
+ 		<emission>
+ 			<red>1</red>
+ 			<green>1</green>
+ 			<blue>1</blue>
+ 			<factor-prop>controls/lighting/DU/mcdu2</factor-prop>
+ 		</emission>
+ 	</animation>
+
+	<animation>
+		<type>pick</type>
+		<object-name>BRT</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac2</property>
+						<value>110</value>
+					</greater-than-equals>
+				</condition>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/mcdu2</property>
+				<min>0.0</min>
+				<max>1.0</max>
+				<step>0.2</step>
+				<wrap>false</wrap>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>pick</type>
+		<object-name>DIM</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac2</property>
+						<value>110</value>
+					</greater-than-equals>
+				</condition>
+				<command>property-adjust</command>
+				<property>controls/lighting/DU/mcdu2</property>
+				<min>0.0</min>
+				<max>1.0</max>
+				<step>-0.2</step>
+				<wrap>false</wrap>
+			</binding>
+		</action>
+	</animation>
 	
 	<animation>
 		<type>pick</type>
@@ -33,10 +90,16 @@
 				<command>nasal</command>
 				<script>mcdu2.pagebutton("radnav");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -52,10 +115,16 @@
 				<command>nasal</command>
 				<script>mcdu2.pagebutton("init");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -71,10 +140,16 @@
 				<command>nasal</command>
 				<script>mcdu2.pagebutton("data");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -90,10 +165,16 @@
 				<command>nasal</command>
 				<script>mcdu2.pagebutton("mcdu");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -109,10 +190,16 @@
 				<command>nasal</command>
 				<script>mcdu2.pagebutton("perf");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -128,10 +215,16 @@
 				<command>nasal</command>
 				<script>mcdu2.pagebutton("f-pln");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -147,10 +240,16 @@
 				<command>nasal</command>
 				<script>mcdu2.pagebutton("fuel-pred");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -166,10 +265,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -180,10 +285,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton_b("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -198,10 +309,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -212,10 +329,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton_b("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -230,10 +353,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -244,10 +373,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton_b("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -262,10 +397,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -276,10 +417,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton_b("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -294,10 +441,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -308,10 +461,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton_b("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -326,10 +485,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -340,10 +505,16 @@
 				<command>nasal</command>
 				<script>mcdu2.lskbutton_b("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -359,10 +530,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -373,10 +550,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton_b("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -391,10 +574,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -405,10 +594,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton_b("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -423,10 +618,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -437,10 +638,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton_b("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -455,10 +662,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -469,10 +682,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton_b("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -487,10 +706,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -501,10 +726,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton_b("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -519,10 +750,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -533,10 +770,16 @@
 				<command>nasal</command>
 				<script>mcdu2.rskbutton_b("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -552,10 +795,16 @@
 				<command>nasal</command>
 				<script>mcdu2.arrowbutton("left");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -570,10 +819,16 @@
 				<command>nasal</command>
 				<script>mcdu2.arrowbutton("right");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -588,10 +843,16 @@
 				<command>nasal</command>
 				<script>mcdu2.arrowbutton("up");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -606,10 +867,16 @@
 				<command>nasal</command>
 				<script>mcdu2.arrowbutton("down");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -625,10 +892,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("A");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -643,10 +916,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("B");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -661,10 +940,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("C");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -679,10 +964,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("D");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -697,10 +988,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("E");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -715,10 +1012,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("F");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -733,10 +1036,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("G");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -751,10 +1060,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("H");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -769,10 +1084,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("I");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -787,10 +1108,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("J");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -805,10 +1132,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("K");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -823,10 +1156,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("L");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -841,10 +1180,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("M");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -859,10 +1204,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("N");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -877,10 +1228,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("O");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -895,10 +1252,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("P");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -913,10 +1276,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("Q");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -931,10 +1300,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("R");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -949,10 +1324,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("S");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -967,10 +1348,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("T");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -985,10 +1372,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("U");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1003,10 +1396,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("V");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1021,10 +1420,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("W");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1039,10 +1444,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("X");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1057,10 +1468,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("Y");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1075,10 +1492,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("Z");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1093,10 +1516,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("SLASH");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1111,10 +1540,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("SP");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1129,10 +1564,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("OVFY");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1147,10 +1588,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("CLR");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1165,10 +1612,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("0");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1183,10 +1636,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("1");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1201,10 +1660,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("2");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1219,10 +1684,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("3");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1237,10 +1708,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("4");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1255,10 +1732,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("5");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1273,10 +1756,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("6");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1291,10 +1780,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("7");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1309,10 +1804,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("8");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1327,10 +1828,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("9");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1345,10 +1852,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("DOT");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>
@@ -1363,10 +1876,16 @@
 				<command>nasal</command>
 				<script>mcdu2.button("PLUSMINUS");</script>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
+					<and>
+						<greater-than-equals>
+							<property>systems/electrical/bus/ac2</property>
+							<value>110</value>
+						</greater-than-equals>
+						<greater-than>
+							<property>controls/lighting/DU/mcdu2</property>
+							<value>0</value>
+						</greater-than>
+					</and>
 				</condition>
 			</binding>
 		</action>

From 8399484b1e4f8649ac13f06a94c45f1de08174c9 Mon Sep 17 00:00:00 2001
From: merspieler <merspieler@airmail.cc>
Date: Thu, 8 Nov 2018 00:03:00 +0100
Subject: [PATCH 2/2] Removed accidentaly added line

Signed-off-by: merspieler <merspieler@airmail.cc>
---
 Models/Instruments/MCDU/MCDU.nas | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas
index 92a3064d..877680dc 100644
--- a/Models/Instruments/MCDU/MCDU.nas
+++ b/Models/Instruments/MCDU/MCDU.nas
@@ -104,7 +104,6 @@ var canvas_MCDU_base = {
 			MCDU_1.page.hide();
 		}
 		if (getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/controls/lighting/DU/mcdu2") > 0) {
-			MCDU_1.update();
 			MCDU_2.update();
 			MCDU_2.updateFast();
 			updateR = 1;