diff --git a/A320-main.xml b/A320-main.xml
index b7799dde..9e348f51 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -613,8 +613,8 @@
 			<cones type="bool">true</cones>
 			<dome-norm type="double">0</dome-norm>
 			<landing-lights n="0" type="bool">0</landing-lights>
-			<landing-lights n="1" type="bool">0</landing-lights>
-			<landing-lights n="2" type="bool">0</landing-lights>
+			<landing-lights n="1" type="double">0</landing-lights>
+			<landing-lights n="2" type="double">0</landing-lights>
 			<nav-lights-switch type="int">0</nav-lights-switch>
 			<overhead-panel-norm type="double">0.0</overhead-panel-norm>
 			<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm>
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 99980a16..6defbc4c 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -73,6 +73,8 @@ var failReset = func {
 	setprop("/systems/failures/tank4pump1", 0);
 	setprop("/systems/failures/tank4pump2", 0);
 	setprop("/systems/failures/fuelmode", 0);
+	setprop("/systems/failures/cargo-aft-fire", 0);
+	setprop("/systems/failures/cargo-fwd-fire", 0);
 }
 
 failReset();
diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml
index 7e5077c1..cd4a34ec 100644
--- a/AircraftConfig/fail.xml
+++ b/AircraftConfig/fail.xml
@@ -474,9 +474,9 @@
 			</group>
 			
 			<checkbox>
-				<label>FWD</label>
+				<label>AFT</label>
 				<halign>left</halign>
-				<property>/systems/fire/cargo/fwddet</property>
+				<property>/systems/failures/cargo-aft-fire</property>
 				<binding>
 					<command>dialog-apply</command>
 				</binding>
@@ -484,9 +484,9 @@
 			</checkbox>
 			
 			<checkbox>
-				<label>AFT</label>
+				<label>FWD</label>
 				<halign>left</halign>
-				<property>/systems/fire/cargo/aftdet</property>
+				<property>/systems/failures/cargo-fwd-fire</property>
 				<binding>
 					<command>dialog-apply</command>
 				</binding>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 54ad5f71..40665e5c 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -248,7 +248,7 @@
 		</diffuse>
 	</animation>
 	
-	<!-- cargo smoke -->
+	<!-- Cargo Smoke -->
 	<animation>
 		<type>select</type>
 		<object-name>FwdCargoSmkBtn1S</object-name>
@@ -317,7 +317,6 @@
 		</condition>
 	</animation>
 	
-	
 	<animation>
 		<name>Cargo Smoke Test</name>
 		<type>pick</type>
@@ -326,6 +325,18 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-assign</command>
 				<property>controls/fire/cargo/test</property>
 				<value>1</value>
@@ -337,47 +348,85 @@
 		</action>
 	</animation>
 	
-	<!--<animation>
-		<type>rotate</type>
-		<object-name>AftCargoDischGuard</object-name>
-		<property>controls/OH/protectors/aftdisch</property>
-		<factor>-145</factor>
-		<axis>
-			
-		</axis>
-	</animation>-->
-	
-	<!--<animation>
-		<type>rotate</type>
-		<object-name>FwdCargoDischGuard</object-name>
-		<property>controls/OH/protectors/fwddisch</property>
-		<factor>-145</factor>
-		<axis>
-			
-		</axis>
-	</animation>-->
+	<animation>
+		<type>pick</type>
+		<object-name>FwdCargoDischBtn</object-name>
+		<action>
+			<button>0</button>
+			<binding>
+				<condition>
+					<and>
+						<equals>
+							<property>controls/OH/protectors/fwddisch</property>
+							<value>1</value>
+						</equals>
+						<or>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc1</property>
+								<value>25</value>
+							</greater-than-equals>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc2</property>
+								<value>25</value>
+							</greater-than-equals>
+						</or>
+					</and>
+				</condition>
+				<command>property-assign</command>
+				<property>controls/fire/cargo/fwddisch</property>
+				<value>1</value>
+			</binding>
+			<binding>
+				<condition>
+					<equals>
+						<property>controls/OH/protectors/aftdisch</property>
+						<value>1</value>
+					</equals>
+				</condition>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
+			</binding>
+		</action>
+	</animation>
 	
 	<animation>
 		<type>pick</type>
-		<object-name>AftCargoDischGuard</object-name>
+		<object-name>AftCargoDischBtn</object-name>
 		<action>
-			<button>1</button>
+			<button>0</button>
 			<binding>
+				<condition>
+					<and>
+						<equals>
+							<property>controls/OH/protectors/aftdisch</property>
+							<value>1</value>
+						</equals>
+						<or>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc1</property>
+								<value>25</value>
+							</greater-than-equals>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc2</property>
+								<value>25</value>
+							</greater-than-equals>
+						</or>
+					</and>
+				</condition>
 				<command>property-assign</command>
-				<property>controls/OH/protectors/aftdisch</property>
+				<property>controls/fire/cargo/aftdisch</property>
 				<value>1</value>
 			</binding>
-			<mod-up>
-				<binding>
-					<command>property-assign</command>
-					<property>controls/OH/protectors/aftdisch</property>
-					<value>0</value>
-				</binding>
-				<binding>
-					<command>nasal</command>
-					<script>setprop("/sim/sounde/oh-cover", 1);</script>
-				</binding>
-			</mod-up>
+			<binding>
+				<condition>
+					<equals>
+						<property>controls/OH/protectors/aftdisch</property>
+						<value>1</value>
+					</equals>
+				</condition>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
+			</binding>
 		</action>
 	</animation>
 	
@@ -407,41 +456,56 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>FwdCargoDischBtn</object-name>
+		<object-name>AftCargoDischGuard</object-name>
 		<action>
-			<button>0</button>
+			<button>1</button>
 			<binding>
 				<command>property-assign</command>
-				<property>controls/fire/cargo/fwddisch</property>
+				<property>controls/OH/protectors/aftdisch</property>
 				<value>1</value>
 			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("/sim/sounde/oh-btn", 1);</script>
-			</binding>
+			<mod-up>
+				<binding>
+					<command>property-assign</command>
+					<property>controls/OH/protectors/aftdisch</property>
+					<value>0</value>
+				</binding>
+				<binding>
+					<command>nasal</command>
+					<script>setprop("/sim/sounde/oh-cover", 1);</script>
+				</binding>
+			</mod-up>
 		</action>
 	</animation>
 	
 	<animation>
-		<type>pick</type>
-		<object-name>AftCargoDischBtn</object-name>
-		<action>
-			<button>0</button>
-			<binding>
-				<command>property-assign</command>
-				<property>controls/fire/cargo/aftdisch</property>
-				<value>1</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("/sim/sounde/oh-btn", 1);</script>
-			</binding>
-		</action>
+		<type>rotate</type>
+		<object-name>FwdCargoDischGuard</object-name>
+		<property>controls/OH/protectors/fwddisch</property>
+		<factor>-145</factor>
+		<axis>
+			<x1-m>-0.0067</x1-m>
+			<y1-m>0.19051</y1-m>
+			<z1-m>-0.11153</z1-m>
+			<x2-m>-0.00524</x2-m>
+			<y2-m>0.20242</y2-m>
+			<z2-m>-0.11153</z2-m>
+		</axis>
 	</animation>
 	
 	<animation>
-		<type>pick</type>
-		<object-name>AftCargoDischBtn</object-name>
+		<type>rotate</type>
+		<object-name>AftCargoDischGuard</object-name>
+		<property>controls/OH/protectors/aftdisch</property>
+		<factor>-145</factor>
+		<axis>
+			<x1-m>0.00633</x1-m>
+			<y1-m>0.29475</y1-m>
+			<z1-m>-0.11153</z1-m>
+			<x2-m>0.00779</x2-m>
+			<y2-m>0.30666</y2-m>
+			<z2-m>-0.11153</z2-m>
+		</axis>
 	</animation>
 	
 	<!-- IRS 1 -->
@@ -4836,8 +4900,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
-				<command>property-toggle</command>
+				<command>property-cycle</command>
 				<property>controls/lighting/landing-lights[1]</property>
+				<value>0</value>
+				<value>0.5</value>
+				<value>1</value>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<action>
+			<button>1</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/lighting/landing-lights[1]</property>
+				<value>1</value>
+				<value>0.5</value>
+				<value>0</value>
 			</binding>
 			<binding>
 				<command>nasal</command>
@@ -4854,8 +4936,26 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
-				<command>property-toggle</command>
+				<command>property-cycle</command>
 				<property>controls/lighting/landing-lights[2]</property>
+				<value>0</value>
+				<value>0.5</value>
+				<value>1</value>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<action>
+			<button>1</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/lighting/landing-lights[2]</property>
+				<value>1</value>
+				<value>0.5</value>
+				<value>0</value>
 			</binding>
 			<binding>
 				<command>nasal</command>
diff --git a/Nasal/fire.nas b/Nasal/fire.nas
index 665fd5a9..cb4faa39 100644
--- a/Nasal/fire.nas
+++ b/Nasal/fire.nas
@@ -13,8 +13,8 @@ setlistener("/sim/signals/fdm-initialized", func {
 	var level = getprop("/systems/fire/cargo/bottlelevel");
 	var fwdsquib = getprop("/systems/fire/cargo/fwdsquib");
 	var aftsquib = getprop("/systems/fire/cargo/aftsquib");
-	var fwddet = getprop("/systems/fire/cargo/fwddet");
-	var aftdet = getprop("/systems/fire/cargo/aftdet");
+	var fwddet = getprop("/systems/failures/cargo-fwd-fire");
+	var aftdet = getprop("/systems/failures/cargo-aft-fire");
 	var test = getprop("/controls/fire/cargo/test");
 	var guard1 = getprop("/controls/fire/cargo/fwdguard");
 	var guard2 = getprop("/controls/fire/cargo/aftguard");
@@ -35,8 +35,8 @@ setlistener("/sim/signals/fdm-initialized", func {
 var fire_init = func {
 	setprop("/controls/OH/protectors/fwddisch", 0);
 	setprop("/controls/OH/protectors/aftdisch", 0);
-	setprop("/systems/fire/cargo/fwddet", 0);
-	setprop("/systems/fire/cargo/aftdet", 0);
+	setprop("/systems/failures/cargo-fwd-fire", 0);
+	setprop("/systems/failures/cargo-aft-fire", 0);
 	setprop("/systems/fire/cargo/fwdsquib", 0);
 	setprop("/systems/fire/cargo/aftsquib", 0);
 	setprop("/systems/fire/cargo/bottlelevel", 100);
@@ -67,8 +67,8 @@ var master_fire = func {
 	level = getprop("/systems/fire/cargo/bottlelevel");
 	fwdsquib = getprop("/systems/fire/cargo/fwdsquib");
 	aftsquib = getprop("/systems/fire/cargo/aftsquib");
-	fwddet = getprop("/systems/fire/cargo/fwddet");
-	aftdet = getprop("/systems/fire/cargo/aftdet");
+	fwddet = getprop("/systems/failures/cargo-fwd-fire");
+	aftdet = getprop("/systems/failures/cargo-aft-fire");
 	test = getprop("/controls/fire/cargo/test");
 	guard1 = getprop("/controls/fire/cargo/fwdguard");
 	guard2 = getprop("/controls/fire/cargo/aftguard");
diff --git a/revision.txt b/revision.txt
index 929e30ed..42cda8bd 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-1519
\ No newline at end of file
+1520 
\ No newline at end of file