From 89cca446ef1b11f7d5245f91d823c520d319cd3e Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 10 Jun 2017 14:17:13 -0400
Subject: [PATCH] A3XX: Major Hydraulic System Update, Spoilers now fully
 intependant

---
 A320-main.xml                   |   46 +-
 AircraftConfig/acconfig.nas     |   12 +-
 Models/Wings/a320.wings.cfm.xml |   24 +-
 Models/Wings/a320.wings.iae.xml |   24 +-
 Systems/hydraulics.xml          | 1327 +++++++++++++++++++++++--------
 Systems/it-fbw-b.xml            |   85 +-
 Systems/it-fbw.xml              |   38 +-
 7 files changed, 1145 insertions(+), 411 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 56b05b16..42f04ca5 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -189,8 +189,6 @@
 				<float n="6" alias="/controls/flight/aileron-left" />
 				<float n="7" alias="/controls/flight/aileron-right" />
 				<float n="8" alias="/controls/flight/rudder-fdm" />
-				<float n="9" alias="/controls/flight/spoiler-left" />
-				<float n="10" alias="/controls/flight/spoiler-right" />
 				<float n="11" alias="/fdm/jsbsim/fcs/slat-pos-norm" />
 				<int n="2" alias="/controls/lighting/landing-lights[0]" />
 				<int n="3" alias="/controls/lighting/landing-lights[1]" />
@@ -434,9 +432,19 @@
 			<elevator-left>0.1</elevator-left>
 			<elevator-right>0.1</elevator-right>
 			<elevator-sum>0.2</elevator-sum>
-			<spoiler-left>0.0</spoiler-left>
+			<spoiler-l1>0.0</spoiler-l1>
+			<spoiler-l2>0.0</spoiler-l2>
+			<spoiler-l3>0.0</spoiler-l3>
+			<spoiler-l4>0.0</spoiler-l4>
+			<spoiler-l5>0.0</spoiler-l5>
+			<spoiler-l-sum>0.0</spoiler-l-sum>
 			<spoiler-output>0.0</spoiler-output>
-			<spoiler-right>0.0</spoiler-right>
+			<spoiler-r1>0.0</spoiler-r1>
+			<spoiler-r2>0.0</spoiler-r2>
+			<spoiler-r3>0.0</spoiler-r3>
+			<spoiler-r4>0.0</spoiler-r4>
+			<spoiler-r5>0.0</spoiler-r5>
+			<spoiler-r-sum>0.0</spoiler-r-sum>
 			<speedbrake-arm>0</speedbrake-arm>
 			<ground-spoilers-armed type="bool">0</ground-spoilers-armed>
 			<speedbrake-lever type="double">0</speedbrake-lever>
@@ -697,6 +705,36 @@
 					<value>0</value>
 				</binding>
 				<binding>
+					<condition>
+						<or>
+							<equals>
+								<property>/gear/gear[1]/wow</property>
+								<value>1</value>
+							</equals>
+							<equals>
+								<property>/gear/gear[2]/wow</property>
+								<value>1</value>
+							</equals>
+						</or>
+					</condition>
+					<command>property-cycle</command>
+					<property>controls/flight/speedbrake-lever</property>
+					<value>0</value>
+					<value>1</value>
+				</binding>
+				<binding>
+					<condition>
+						<and>
+							<equals>
+								<property>/gear/gear[1]/wow</property>
+								<value>0</value>
+							</equals>
+							<equals>
+								<property>/gear/gear[2]/wow</property>
+								<value>0</value>
+							</equals>
+						</and>
+					</condition>
 					<command>property-cycle</command>
 					<property>controls/flight/speedbrake-lever</property>
 					<value>0</value>
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 2e122c04..83d0e6ea 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -31,6 +31,16 @@ var failReset = func {
 	setprop("/systems/failures/elevator-left", 0);
 	setprop("/systems/failures/elevator-right", 0);
 	setprop("/systems/failures/rudder", 0);
+	setprop("/systems/failures/spoiler-l1", 0);
+	setprop("/systems/failures/spoiler-l2", 0);
+	setprop("/systems/failures/spoiler-l3", 0);
+	setprop("/systems/failures/spoiler-l4", 0);
+	setprop("/systems/failures/spoiler-l5", 0);
+	setprop("/systems/failures/spoiler-r1", 0);
+	setprop("/systems/failures/spoiler-r2", 0);
+	setprop("/systems/failures/spoiler-r3", 0);
+	setprop("/systems/failures/spoiler-r4", 0);
+	setprop("/systems/failures/spoiler-r5", 0);
 	setprop("/systems/failures/elec-ac-ess", 0);
 	setprop("/systems/failures/elec-batt1", 0);
 	setprop("/systems/failures/elec-batt2", 0);
@@ -54,8 +64,6 @@ var failReset = func {
 	setprop("/systems/failures/pump-yellow-elec", 0);
 }
 
-setprop("/systems/failures/spoiler-left", 0);
-setprop("/systems/failures/spoiler-right", 0); 
 failReset();
 setprop("/systems/acconfig/autoconfig-running", 0);
 setprop("/systems/acconfig/spinning", 0);
diff --git a/Models/Wings/a320.wings.cfm.xml b/Models/Wings/a320.wings.cfm.xml
index 6a0cb749..a4f4bf40 100644
--- a/Models/Wings/a320.wings.cfm.xml
+++ b/Models/Wings/a320.wings.cfm.xml
@@ -303,9 +303,9 @@
 		<name>Left spoiler 1</name>
 		<type>rotate</type>
 		<object-name>SpoilerL1</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l1</property>
 		<interpolation>
-			<entry><ind>0.5</ind><dep> 0</dep></entry>
+			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
 		</interpolation>
 		<axis>
@@ -321,7 +321,7 @@
 		<name>Left spoiler 2</name>
 		<type>rotate</type>
 		<object-name>SpoilerL2</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l2</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -339,7 +339,7 @@
 		<name>Left spoiler 3</name>
 		<type>rotate</type>
 		<object-name>SpoilerL3</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l3</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -357,7 +357,7 @@
 		<name>Left spoiler 4</name>
 		<type>rotate</type>
 		<object-name>SpoilerL4</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l4</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -375,7 +375,7 @@
 		<name>Left spoiler 5</name>
 		<type>rotate</type>
 		<object-name>SpoilerL5</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l5</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -393,9 +393,9 @@
 		<name>Right spoiler 1</name>
 		<type>rotate</type>
 		<object-name>SpoilerR1</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r1</property>
 		<interpolation>
-			<entry><ind>0.5</ind><dep> 0</dep></entry>
+			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
 		</interpolation>
 		<axis>
@@ -411,7 +411,7 @@
 		<name>Right spoiler 2</name>
 		<type>rotate</type>
 		<object-name>SpoilerR2</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r2</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -429,7 +429,7 @@
 		<name>Right spoiler 3</name>
 		<type>rotate</type>
 		<object-name>SpoilerR3</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r3</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -447,7 +447,7 @@
 		<name>Right spoiler 4</name>
 		<type>rotate</type>
 		<object-name>SpoilerR4</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r4</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -465,7 +465,7 @@
 		<name>Right spoiler 5</name>
 		<type>rotate</type>
 		<object-name>SpoilerR5</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r5</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
diff --git a/Models/Wings/a320.wings.iae.xml b/Models/Wings/a320.wings.iae.xml
index abf753bf..0f8f39d4 100644
--- a/Models/Wings/a320.wings.iae.xml
+++ b/Models/Wings/a320.wings.iae.xml
@@ -303,9 +303,9 @@
 		<name>Left spoiler 1</name>
 		<type>rotate</type>
 		<object-name>SpoilerL1</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l1</property>
 		<interpolation>
-			<entry><ind>0.5</ind><dep> 0</dep></entry>
+			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
 		</interpolation>
 		<axis>
@@ -321,7 +321,7 @@
 		<name>Left spoiler 2</name>
 		<type>rotate</type>
 		<object-name>SpoilerL2</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l2</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -339,7 +339,7 @@
 		<name>Left spoiler 3</name>
 		<type>rotate</type>
 		<object-name>SpoilerL3</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l3</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -357,7 +357,7 @@
 		<name>Left spoiler 4</name>
 		<type>rotate</type>
 		<object-name>SpoilerL4</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l4</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -375,7 +375,7 @@
 		<name>Left spoiler 5</name>
 		<type>rotate</type>
 		<object-name>SpoilerL5</object-name>
-		<property>/sim/multiplay/generic/float[9]</property>
+		<property>/controls/flight/spoiler-l5</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -393,9 +393,9 @@
 		<name>Right spoiler 1</name>
 		<type>rotate</type>
 		<object-name>SpoilerR1</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r1</property>
 		<interpolation>
-			<entry><ind>0.5</ind><dep> 0</dep></entry>
+			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
 		</interpolation>
 		<axis>
@@ -411,7 +411,7 @@
 		<name>Right spoiler 2</name>
 		<type>rotate</type>
 		<object-name>SpoilerR2</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r2</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -429,7 +429,7 @@
 		<name>Right spoiler 3</name>
 		<type>rotate</type>
 		<object-name>SpoilerR3</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r3</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -447,7 +447,7 @@
 		<name>Right spoiler 4</name>
 		<type>rotate</type>
 		<object-name>SpoilerR4</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r4</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
@@ -465,7 +465,7 @@
 		<name>Right spoiler 5</name>
 		<type>rotate</type>
 		<object-name>SpoilerR5</object-name>
-		<property>/sim/multiplay/generic/float[10]</property>
+		<property>/controls/flight/spoiler-r5</property>
 		<interpolation>
 			<entry><ind>0.0</ind><dep> 0</dep></entry>
 			<entry><ind>1.0</ind><dep>30</dep></entry>
diff --git a/Systems/hydraulics.xml b/Systems/hydraulics.xml
index e27e2bb5..c3226592 100644
--- a/Systems/hydraulics.xml
+++ b/Systems/hydraulics.xml
@@ -17,7 +17,7 @@
             <expression>
                 <table>
                     <property>/instrumentation/airspeed-indicator/indicated-speed-kt</property>
-                    <entry><ind> 72</ind><dep>0.5</dep></entry>
+                    <entry><ind> 62</ind><dep>0.5</dep></entry>
                     <entry><ind>116</ind><dep>0.0</dep></entry>
                 </table>
             </expression>
@@ -34,7 +34,7 @@
             <expression>
                 <table>
                     <property>/instrumentation/airspeed-indicator/indicated-speed-kt</property>
-                    <entry><ind> 87</ind><dep>0.5</dep></entry>
+                    <entry><ind> 72</ind><dep>0.5</dep></entry>
                     <entry><ind>121</ind><dep>0.0</dep></entry>
                 </table>
             </expression>
@@ -45,6 +45,8 @@
  <!-- =============================================================== -->
  <!-- Aileron Control                                                 -->
  <!-- =============================================================== -->
+ 
+	<!-- Aileron L -->
 
 	<filter>
 		<debug>false</debug>
@@ -86,7 +88,7 @@
 					<property>/surface-positions/speedbrake-pos-norm</property>
 					<table>
 						<property>/controls/flight/roll-fbw</property> 
-						<entry><ind>0.2</ind><dep>   0</dep></entry>
+						<entry><ind>0.0</ind><dep>   0</dep></entry>
 						<entry><ind>1.0</ind><dep>-1.0</dep></entry>
 					</table>
 				</sum>
@@ -160,6 +162,8 @@
 		<max-rate-of-change>2.5</max-rate-of-change>
 	</filter>
 	
+	<!-- Aileron R -->
+	
 	<filter>
 		<debug>false</debug>
 		<type>gain</type>
@@ -200,7 +204,7 @@
 					<property>/surface-positions/speedbrake-pos-norm</property>
 					<table>
 						<property>/controls/flight/roll-fbw</property> 
-						<entry><ind>-0.2</ind><dep>   0</dep></entry>
+						<entry><ind>-0.0</ind><dep>   0</dep></entry>
 						<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
 					</table>
 				</sum>
@@ -278,6 +282,8 @@
  <!-- =============================================================== -->
  <!-- Spoiler Control                                                 -->
  <!-- =============================================================== -->
+ 
+	<!-- Spoiler L1 -->
 	
 	<filter>
 		<debug>false</debug>
@@ -286,48 +292,236 @@
 		<input>
 			<condition>
 				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
 					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
 					</or>
+					<equals>
+						<property>/systems/failures/spoiler-l1</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<property>/surface-positions/speedbrake-pos-norm</property> 
+		</input>
+		<input>
+			<condition>
+				<or>
+					<less-than>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</less-than>
+					<equals>
+						<property>/systems/failures/spoiler-l1</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<value>0.0</value>
+		</input>
+		<output>/controls/flight/spoiler-l1-cmd</output>
+		<min>0.0</min>
+		<max>1.0</max>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/spoiler-l1-cmd</input>
+		<output>/controls/flight/spoiler-l1</output>
+		<max-rate-of-change>0.5</max-rate-of-change>
+	</filter>
+ 
+	<!-- Spoiler L2 -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
 					<not-equals>
 						<property>/controls/flight/speedbrake-lever</property>
 						<value>0.0</value>
 					</not-equals>
 					<equals>
-						<property>/systems/failures/aileron-left</property>
+						<property>/gear/gear[1]/wow</property>
 						<value>0</value>
 					</equals>
 					<equals>
-						<property>/systems/failures/spoiler-left</property>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/systems/failures/spoiler-l2</property>
 						<value>0</value>
 					</equals>
 				</and>
 			</condition>
 			<expression>
 				<sum>
-					<property>/surface-positions/speedbrake-pos-norm</property>
+					<table>
+						<property>/surface-positions/speedbrake-pos-norm</property> 
+						<entry><ind>0.1</ind><dep>0.0</dep></entry>
+						<entry><ind>0.5</ind><dep>0.3</dep></entry>
+						<entry><ind>1.0</ind><dep>0.7</dep></entry>
+					</table>
+					<table>
+						<property>/controls/flight/spoiler-left-fbw-cmd</property> 
+						<entry><ind>0.1</ind><dep>   0</dep></entry>
+						<entry><ind>1.0</ind><dep>-0.4</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/systems/failures/spoiler-l2</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<table>
+						<property>/surface-positions/speedbrake-pos-norm</property> 
+						<entry><ind>0.1</ind><dep>0.0</dep></entry>
+						<entry><ind>0.5</ind><dep>0.3</dep></entry>
+						<entry><ind>1.0</ind><dep>1.0</dep></entry>
+					</table>
 					<table>
 						<property>/controls/flight/roll-fbw</property> 
-						<entry><ind>0.2</ind><dep>   0</dep></entry>
+						<entry><ind>0.0</ind><dep>   0</dep></entry>
+						<entry><ind>1.0</ind><dep>-0.5</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<less-than>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</less-than>
+					<equals>
+						<property>/systems/failures/spoiler-l2</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<value>0.0</value>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<equals>
+						<property>/systems/failures/spoiler-l2</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+            <expression>
+                <table>
+                    <property>/controls/flight/spoiler-left-fbw-cmd</property> 
+                    <entry><ind>-0.1</ind><dep>  0</dep></entry>
+                    <entry><ind>-1.0</ind><dep>0.3</dep></entry>
+                </table>
+            </expression>
+		</input>
+		<output>/controls/flight/spoiler-l2-cmd</output>
+		<min>0.0</min>
+		<max>1.0</max>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/spoiler-l2-cmd</input>
+		<output>/controls/flight/spoiler-l2</output>
+		<max-rate-of-change>0.4</max-rate-of-change>
+	</filter>
+	
+	<!-- Spoiler L3 -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/blue-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/systems/failures/spoiler-l3</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
+					<table>
+						<property>/controls/flight/spoiler-left-fbw-cmd</property> 
+						<entry><ind>0.0</ind><dep>   0</dep></entry>
 						<entry><ind>1.0</ind><dep>-0.5</dep></entry>
 					</table>
 				</sum>
@@ -336,49 +530,37 @@
 		<input>
 			<condition>
 				<and>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-					</or>
+					<greater-than-equals>
+						<property>/systems/hydraulic/blue-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
 					<not-equals>
 						<property>/controls/flight/speedbrake-lever</property>
 						<value>0.0</value>
 					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
 					<equals>
-						<property>/systems/failures/aileron-left</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/systems/failures/spoiler-left</property>
+						<property>/systems/failures/spoiler-l3</property>
 						<value>0</value>
 					</equals>
 				</and>
 			</condition>
 			<expression>
 				<sum>
-					<property>/surface-positions/speedbrake-pos-norm</property>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
 					<table>
 						<property>/controls/flight/roll-fbw</property> 
 						<entry><ind>0.0</ind><dep>   0</dep></entry>
-						<entry><ind>1.0</ind><dep>-0.8</dep></entry>
+						<entry><ind>1.0</ind><dep>-0.5</dep></entry>
 					</table>
 				</sum>
 			</expression>
@@ -386,22 +568,12 @@
 		<input>
 			<condition>
 				<or>
-					<and>
-						<less-than>
-							<property>/systems/hydraulic/green-psi</property>
-							<value>1500</value>
-						</less-than>
-						<less-than>
-							<property>/systems/hydraulic/blue-psi</property>
-							<value>1500</value>
-						</less-than>
-						<less-than>
-							<property>/systems/hydraulic/yellow-psi</property>
-							<value>1500</value>
-						</less-than>
-					</and>
+					<less-than>
+						<property>/systems/hydraulic/blue-psi</property>
+						<value>1500</value>
+					</less-than>
 					<equals>
-						<property>/systems/failures/spoiler-left</property>
+						<property>/systems/failures/spoiler-l4</property>
 						<value>1</value>
 					</equals>
 				</or>
@@ -411,34 +583,12 @@
 		<input>
 			<condition>
 				<and>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-					</or>
+					<greater-than-equals>
+						<property>/systems/hydraulic/blue-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
 					<equals>
-						<property>/systems/failures/aileron-left</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/systems/failures/spoiler-left</property>
+						<property>/systems/failures/spoiler-l3</property>
 						<value>0</value>
 					</equals>
 				</and>
@@ -446,55 +596,12 @@
             <expression>
                 <table>
                     <property>/controls/flight/spoiler-left-fbw-cmd</property> 
-                    <entry><ind>-0.2</ind><dep>  0</dep></entry>
+                    <entry><ind>-0.0</ind><dep>  0</dep></entry>
                     <entry><ind>-1.0</ind><dep>0.5</dep></entry>
                 </table>
             </expression>
 		</input>
-		<input>
-			<condition>
-				<and>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-					</or>
-					<equals>
-						<property>/systems/failures/aileron-left</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/systems/failures/spoiler-left</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-            <expression>
-                <table>
-                    <property>/controls/flight/spoiler-left-fbw-cmd</property> 
-                    <entry><ind> 0.0</ind><dep>  0</dep></entry>
-                    <entry><ind>-1.0</ind><dep>0.8</dep></entry>
-                </table>
-            </expression>
-		</input>
-		<output>/controls/flight/spoiler-left-cmd</output>
+		<output>/controls/flight/spoiler-l3-cmd</output>
 		<min>0.0</min>
 		<max>1.0</max>
 	</filter>
@@ -502,11 +609,13 @@
 	<filter>
 		<debug>false</debug>
 		<type>noise-spike</type>
-		<input>/controls/flight/spoiler-left-cmd</input>
-		<output>/controls/flight/spoiler-left</output>
-		<max-rate-of-change>0.5</max-rate-of-change>
+		<input>/controls/flight/spoiler-l3-cmd</input>
+		<output>/controls/flight/spoiler-l3</output>
+		<max-rate-of-change>0.6</max-rate-of-change>
 	</filter>
 	
+	<!-- Spoiler L4 -->
+	
 	<filter>
 		<debug>false</debug>
 		<type>gain</type>
@@ -514,48 +623,478 @@
 		<input>
 			<condition>
 				<and>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-					</or>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
 					<not-equals>
 						<property>/controls/flight/speedbrake-lever</property>
 						<value>0.0</value>
 					</not-equals>
 					<equals>
-						<property>/systems/failures/aileron-right</property>
+						<property>/gear/gear[1]/wow</property>
 						<value>0</value>
 					</equals>
 					<equals>
-						<property>/systems/failures/spoiler-right</property>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/systems/failures/spoiler-l4</property>
 						<value>0</value>
 					</equals>
 				</and>
 			</condition>
 			<expression>
 				<sum>
-					<property>/surface-positions/speedbrake-pos-norm</property>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
+					<table>
+						<property>/controls/flight/spoiler-left-fbw-cmd</property> 
+						<entry><ind>0.0</ind><dep>   0</dep></entry>
+						<entry><ind>1.0</ind><dep>-0.5</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/systems/failures/spoiler-l4</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
 					<table>
 						<property>/controls/flight/roll-fbw</property> 
-						<entry><ind>-0.2</ind><dep>   0</dep></entry>
+						<entry><ind>0.0</ind><dep>   0</dep></entry>
+						<entry><ind>1.0</ind><dep>-0.5</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<less-than>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</less-than>
+					<equals>
+						<property>/systems/failures/spoiler-l4</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<value>0.0</value>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<equals>
+						<property>/systems/failures/spoiler-l4</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+            <expression>
+                <table>
+                    <property>/controls/flight/spoiler-left-fbw-cmd</property> 
+                    <entry><ind>-0.0</ind><dep>  0</dep></entry>
+                    <entry><ind>-1.0</ind><dep>0.5</dep></entry>
+                </table>
+            </expression>
+		</input>
+		<output>/controls/flight/spoiler-l4-cmd</output>
+		<min>0.0</min>
+		<max>1.0</max>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/spoiler-l4-cmd</input>
+		<output>/controls/flight/spoiler-l4</output>
+		<max-rate-of-change>0.6</max-rate-of-change>
+	</filter>
+	
+	<!-- Spoiler L5 -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/systems/failures/spoiler-l5</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
+					<table>
+						<property>/controls/flight/roll-fbw</property> 
+						<entry><ind>0.0</ind><dep>   0</dep></entry>
+						<entry><ind>1.0</ind><dep>-0.5</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<less-than>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</less-than>
+					<equals>
+						<property>/systems/failures/spoiler-l5</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<value>0.0</value>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<equals>
+						<property>/systems/failures/spoiler-l5</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+            <expression>
+                <table>
+                    <property>/controls/flight/spoiler-left-fbw-cmd</property> 
+                    <entry><ind>-0.0</ind><dep>  0</dep></entry>
+                    <entry><ind>-1.0</ind><dep>0.5</dep></entry>
+                </table>
+            </expression>
+		</input>
+		<output>/controls/flight/spoiler-l5-cmd</output>
+		<min>0.0</min>
+		<max>1.0</max>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/spoiler-l5-cmd</input>
+		<output>/controls/flight/spoiler-l5</output>
+		<max-rate-of-change>0.5</max-rate-of-change>
+	</filter>
+	
+	<!-- Left Spoiler Sum -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+            <expression>
+				<sum>
+					<property>/controls/flight/spoiler-l1</property>
+					<property>/controls/flight/spoiler-l2</property>
+					<property>/controls/flight/spoiler-l3</property>
+					<property>/controls/flight/spoiler-l4</property>
+					<property>/controls/flight/spoiler-l5</property>
+				</sum>
+            </expression>
+		</input>
+		<output>/controls/flight/spoiler-l-sum</output>
+	</filter>
+	
+	<!-- Spoiler R1 -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/systems/failures/spoiler-r1</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<property>/surface-positions/speedbrake-pos-norm</property> 
+		</input>
+		<input>
+			<condition>
+				<or>
+					<less-than>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</less-than>
+					<equals>
+						<property>/systems/failures/spoiler-r1</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<value>0.0</value>
+		</input>
+		<output>/controls/flight/spoiler-r1-cmd</output>
+		<min>0.0</min>
+		<max>1.0</max>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/spoiler-r1-cmd</input>
+		<output>/controls/flight/spoiler-r1</output>
+		<max-rate-of-change>0.5</max-rate-of-change>
+	</filter>
+	
+	<!-- Spoiler R2 -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/systems/failures/spoiler-r2</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<table>
+						<property>/surface-positions/speedbrake-pos-norm</property> 
+						<entry><ind>0.1</ind><dep>0.0</dep></entry>
+						<entry><ind>0.5</ind><dep>0.3</dep></entry>
+						<entry><ind>1.0</ind><dep>0.7</dep></entry>
+					</table>
+					<table>
+						<property>/controls/flight/spoiler-right-fbw-cmd</property> 
+						<entry><ind> 0.1</ind><dep>   0</dep></entry>
+						<entry><ind>-1.0</ind><dep>-0.4</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/systems/failures/spoiler-r2</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<table>
+						<property>/surface-positions/speedbrake-pos-norm</property> 
+						<entry><ind>0.1</ind><dep>0.0</dep></entry>
+						<entry><ind>0.5</ind><dep>0.3</dep></entry>
+						<entry><ind>1.0</ind><dep>1.0</dep></entry>
+					</table>
+					<table>
+						<property>/controls/flight/roll-fbw</property> 
+						<entry><ind> 0.0</ind><dep>   0</dep></entry>
+						<entry><ind>-1.0</ind><dep>-0.5</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<less-than>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</less-than>
+					<equals>
+						<property>/systems/failures/spoiler-r2</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<value>0.0</value>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<equals>
+						<property>/systems/failures/spoiler-r2</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+            <expression>
+                <table>
+                    <property>/controls/flight/spoiler-right-fbw-cmd</property> 
+                    <entry><ind>0.1</ind><dep>  0</dep></entry>
+                    <entry><ind>1.0</ind><dep>0.3</dep></entry>
+                </table>
+            </expression>
+		</input>
+		<output>/controls/flight/spoiler-r2-cmd</output>
+		<min>0.0</min>
+		<max>1.0</max>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/spoiler-r2-cmd</input>
+		<output>/controls/flight/spoiler-r2</output>
+		<max-rate-of-change>0.4</max-rate-of-change>
+	</filter>
+	
+	<!-- Spoiler R3 -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<equals>
+						<property>/gear/gear[1]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/systems/failures/spoiler-r3</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
+					<table>
+						<property>/controls/flight/spoiler-right-fbw-cmd</property> 
+						<entry><ind> 0.0</ind><dep>   0</dep></entry>
 						<entry><ind>-1.0</ind><dep>-0.5</dep></entry>
 					</table>
 				</sum>
@@ -564,49 +1103,37 @@
 		<input>
 			<condition>
 				<and>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-					</or>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
 					<not-equals>
 						<property>/controls/flight/speedbrake-lever</property>
 						<value>0.0</value>
 					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
 					<equals>
-						<property>/systems/failures/aileron-right</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/systems/failures/spoiler-right</property>
+						<property>/systems/failures/spoiler-r3</property>
 						<value>0</value>
 					</equals>
 				</and>
 			</condition>
 			<expression>
 				<sum>
-					<property>/surface-positions/speedbrake-pos-norm</property>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
 					<table>
 						<property>/controls/flight/roll-fbw</property> 
 						<entry><ind> 0.0</ind><dep>   0</dep></entry>
-						<entry><ind>-1.0</ind><dep>-0.8</dep></entry>
+						<entry><ind>-1.0</ind><dep>-0.5</dep></entry>
 					</table>
 				</sum>
 			</expression>
@@ -614,22 +1141,12 @@
 		<input>
 			<condition>
 				<or>
-					<and>
-						<less-than>
-							<property>/systems/hydraulic/green-psi</property>
-							<value>1500</value>
-						</less-than>
-						<less-than>
-							<property>/systems/hydraulic/blue-psi</property>
-							<value>1500</value>
-						</less-than>
-						<less-than>
-							<property>/systems/hydraulic/yellow-psi</property>
-							<value>1500</value>
-						</less-than>
-					</and>
+					<less-than>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</less-than>
 					<equals>
-						<property>/systems/failures/spoiler-right</property>
+						<property>/systems/failures/spoiler-r3</property>
 						<value>1</value>
 					</equals>
 				</or>
@@ -639,77 +1156,12 @@
 		<input>
 			<condition>
 				<and>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-					</or>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
 					<equals>
-						<property>/systems/failures/aileron-right</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/systems/failures/spoiler-right</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-            <expression>
-                <table>
-                    <property>/controls/flight/spoiler-right-fbw-cmd</property> 
-                    <entry><ind>0.2</ind><dep>  0</dep></entry>
-                    <entry><ind>1.0</ind><dep>0.5</dep></entry>
-                </table>
-            </expression>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-					</or>
-					<equals>
-						<property>/systems/failures/aileron-right</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/systems/failures/spoiler-right</property>
+						<property>/systems/failures/spoiler-r3</property>
 						<value>0</value>
 					</equals>
 				</and>
@@ -718,11 +1170,11 @@
                 <table>
                     <property>/controls/flight/spoiler-right-fbw-cmd</property> 
                     <entry><ind>0.0</ind><dep>  0</dep></entry>
-                    <entry><ind>1.0</ind><dep>0.8</dep></entry>
+                    <entry><ind>1.0</ind><dep>0.5</dep></entry>
                 </table>
             </expression>
 		</input>
-		<output>/controls/flight/spoiler-right-cmd</output>
+		<output>/controls/flight/spoiler-r3-cmd</output>
 		<min>0.0</min>
 		<max>1.0</max>
 	</filter>
@@ -730,84 +1182,263 @@
 	<filter>
 		<debug>false</debug>
 		<type>noise-spike</type>
-		<input>/controls/flight/spoiler-right-cmd</input>
-		<output>/controls/flight/spoiler-right</output>
-		<max-rate-of-change>0.5</max-rate-of-change>
+		<input>/controls/flight/spoiler-r3-cmd</input>
+		<output>/controls/flight/spoiler-r3</output>
+		<max-rate-of-change>0.6</max-rate-of-change>
 	</filter>
 	
+	<!-- Spoiler R4 -->
+	
 	<filter>
 		<debug>false</debug>
-		<type>noise-spike</type>
+		<type>gain</type>
+		<gain>1.0</gain>
 		<input>
 			<condition>
 				<and>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/green-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/systems/hydraulic/blue-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>/systems/hydraulic/yellow-psi</property>
-								<value>1500</value>
-							</greater-than-equals>
-						</and>
-					</or>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
 					<equals>
-						<property>/systems/failures/spoiler-left</property>
+						<property>/gear/gear[1]/wow</property>
 						<value>0</value>
 					</equals>
 					<equals>
-						<property>/systems/failures/spoiler-right</property>
+						<property>/gear/gear[2]/wow</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/systems/failures/spoiler-r4</property>
 						<value>0</value>
 					</equals>
 				</and>
 			</condition>
-			<property>/fdm/jsbsim/fcs/speedbrake-cmd-norm</property>
+			<expression>
+				<sum>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
+					<table>
+						<property>/controls/flight/spoiler-right-fbw-cmd</property> 
+						<entry><ind> 0.0</ind><dep>   0</dep></entry>
+						<entry><ind>-1.0</ind><dep>-0.5</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/systems/failures/spoiler-r4</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
+					<table>
+						<property>/controls/flight/roll-fbw</property> 
+						<entry><ind> 0.0</ind><dep>   0</dep></entry>
+						<entry><ind>-1.0</ind><dep>-0.5</dep></entry>
+					</table>
+				</sum>
+			</expression>
 		</input>
 		<input>
 			<condition>
 				<or>
-					<and>
-						<less-than>
-							<property>/systems/hydraulic/green-psi</property>
-							<value>1500</value>
-						</less-than>
-						<less-than>
-							<property>/systems/hydraulic/blue-psi</property>
-							<value>1500</value>
-						</less-than>
-						<less-than>
-							<property>/systems/hydraulic/yellow-psi</property>
-							<value>1500</value>
-						</less-than>
-					</and>
+					<less-than>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</less-than>
 					<equals>
-						<property>/systems/failures/spoiler-left</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/systems/failures/spoiler-right</property>
+						<property>/systems/failures/spoiler-r4</property>
 						<value>1</value>
 					</equals>
 				</or>
 			</condition>
 			<value>0.0</value>
 		</input>
-		<output>/controls/flight/spoiler-output</output>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<equals>
+						<property>/systems/failures/spoiler-r4</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+            <expression>
+                <table>
+                    <property>/controls/flight/spoiler-right-fbw-cmd</property> 
+                    <entry><ind>0.0</ind><dep>  0</dep></entry>
+                    <entry><ind>1.0</ind><dep>0.5</dep></entry>
+                </table>
+            </expression>
+		</input>
+		<output>/controls/flight/spoiler-r4-cmd</output>
+		<min>0.0</min>
+		<max>1.0</max>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/spoiler-r4-cmd</input>
+		<output>/controls/flight/spoiler-r4</output>
+		<max-rate-of-change>0.6</max-rate-of-change>
+	</filter>
+	
+	<!-- Spoiler R5 -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<not-equals>
+						<property>/controls/flight/speedbrake-lever</property>
+						<value>0.0</value>
+					</not-equals>
+					<or>
+						<equals>
+							<property>/gear/gear[1]/wow</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/gear/gear[2]/wow</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/systems/failures/spoiler-r5</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<expression>
+				<sum>
+					<property>/surface-positions/speedbrake-pos-norm</property> 
+					<table>
+						<property>/controls/flight/roll-fbw</property> 
+						<entry><ind> 0.0</ind><dep>   0</dep></entry>
+						<entry><ind>-1.0</ind><dep>-0.5</dep></entry>
+					</table>
+				</sum>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<less-than>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</less-than>
+					<equals>
+						<property>/systems/failures/spoiler-r5</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<value>0.0</value>
+		</input>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<equals>
+						<property>/systems/failures/spoiler-r5</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+            <expression>
+                <table>
+                    <property>/controls/flight/spoiler-right-fbw-cmd</property> 
+                    <entry><ind>0.0</ind><dep>  0</dep></entry>
+                    <entry><ind>1.0</ind><dep>0.5</dep></entry>
+                </table>
+            </expression>
+		</input>
+		<output>/controls/flight/spoiler-r5-cmd</output>
+		<min>0.0</min>
+		<max>1.0</max>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>/controls/flight/spoiler-r5-cmd</input>
+		<output>/controls/flight/spoiler-r5</output>
 		<max-rate-of-change>0.5</max-rate-of-change>
 	</filter>
 	
+	<!-- Right Spoiler Sum -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+            <expression>
+				<sum>
+					<property>/controls/flight/spoiler-r1</property>
+					<property>/controls/flight/spoiler-r2</property>
+					<property>/controls/flight/spoiler-r3</property>
+					<property>/controls/flight/spoiler-r4</property>
+					<property>/controls/flight/spoiler-r5</property>
+				</sum>
+            </expression>
+		</input>
+		<output>/controls/flight/spoiler-r-sum</output>
+	</filter>
+	
+	<!-- Spoiler Lever -->
+	
+	<filter>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>/fdm/jsbsim/fcs/speedbrake-cmd-norm</input>
+		<output>/controls/flight/spoiler-output</output>
+	</filter>
+	
  <!-- =============================================================== -->
  <!-- Roll Control                                                    -->
  <!-- =============================================================== -->
@@ -820,19 +1451,15 @@
             <expression>
 				<product>
 					<sum>
-						<sum>
-							<property>/controls/flight/aileron-left</property>
-							<property>/controls/flight/aileron-right</property>
-						</sum>
-						<sum>
-							<product>
-								<property>/controls/flight/spoiler-left</property>
-								<value>-1.0</value>
-							</product>
-							<property>/controls/flight/spoiler-right</property>
-						</sum>
+						<property>/controls/flight/aileron-left</property>
+						<property>/controls/flight/aileron-right</property>
+						<product>
+							<property>/controls/flight/spoiler-l-sum</property>
+							<value>-1.0</value>
+						</product>
+						<property>/controls/flight/spoiler-r-sum</property>
 					</sum>
-					<value>0.666</value>
+					<value>0.3571</value>
 				</product>
             </expression>
 		</input>
diff --git a/Systems/it-fbw-b.xml b/Systems/it-fbw-b.xml
index 669e5611..d284b99c 100644
--- a/Systems/it-fbw-b.xml
+++ b/Systems/it-fbw-b.xml
@@ -115,7 +115,7 @@
 			<property>/controls/flight/aileron-fbw-cmd</property>
 		</output>
 		<config>
-			<Kp>0.06</Kp>
+			<Kp>0.11</Kp>
 			<beta>1</beta>
 			<alpha>0.1</alpha>
 			<gamma>0</gamma>
@@ -159,7 +159,6 @@
 				</and>
 			</condition>
 			<property>/controls/flight/aileron-fbw-cmd</property>
-			<scale>2.0</scale>
 		</input>
 		<input>
 			<condition>
@@ -208,7 +207,6 @@
 		<name>IT-FBW: AILERON</name>
 		<type>gain</type>
 		<gain>1</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>/controls/flight/roll-fbw</input>
 		<output>/controls/flight/aileron-fbw</output>
 	</filter>
@@ -217,21 +215,85 @@
 		<name>IT-FBW: LEFT SPOILER</name>
 		<type>gain</type>
 		<gain>1</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
-		<input>/controls/flight/roll-fbw</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/systems/failures/aileron-left</property>
+					<value>0</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/controls/flight/roll-fbw</property>
+					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
+					<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
+					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
+					<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
+					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/systems/failures/aileron-left</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/controls/flight/roll-fbw</property>
+					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
+					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
+					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/controls/flight/spoiler-left-fbw-cmd</output>
 		<min>-1</min>
-		<max>0</max>
+		<max>1</max>
 	</filter>
 	
 	<filter>
 		<name>IT-FBW: RIGHT SPOILER</name>
 		<type>gain</type>
 		<gain>1</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
-		<input>/controls/flight/roll-fbw</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/systems/failures/aileron-right</property>
+					<value>0</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/controls/flight/roll-fbw</property>
+					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
+					<entry><ind>-0.2</ind><dep> 0.0</dep></entry>
+					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
+					<entry><ind> 0.2</ind><dep> 0.0</dep></entry>
+					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/systems/failures/aileron-right</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<expression>
+				<table>
+					<property>/controls/flight/roll-fbw</property>
+					<entry><ind>-1.0</ind><dep>-1.0</dep></entry>
+					<entry><ind> 0.0</ind><dep> 0.0</dep></entry>
+					<entry><ind> 1.0</ind><dep> 1.0</dep></entry>
+				</table>
+			</expression>
+		</input>
 		<output>/controls/flight/spoiler-right-fbw-cmd</output>
-		<min>0</min>
+		<min>-1</min>
 		<max>1</max>
 	</filter>
 	
@@ -288,11 +350,11 @@
 			<property>/controls/flight/elevator-fbw-cmd</property>
 		</output>
 		<config>
-			<Kp>-0.10</Kp>
+			<Kp>-0.22</Kp>
 			<beta>1</beta>
 			<alpha>0.1</alpha>
 			<gamma>0</gamma>
-			<Ti>5</Ti>
+			<Ti>10</Ti>
 			<Td>0.002</Td>
 			<u_min>-0.5</u_min>
 			<u_max>0.5</u_max>
@@ -510,7 +572,6 @@
 				</and>
 			</condition>
 			<property>/controls/flight/elevator-fbw-cmd</property>
-			<scale>2.0</scale>
 		</input>
 		<input>
 			<condition>
diff --git a/Systems/it-fbw.xml b/Systems/it-fbw.xml
index a695f473..3a782ec9 100644
--- a/Systems/it-fbw.xml
+++ b/Systems/it-fbw.xml
@@ -37,19 +37,19 @@
 						<table>
 							<independentVar lookup="row">/controls/flight/aileron-input</independentVar>
 							<tableData>
-							-1.0     -0.150
-							-0.7     -0.100
-							-0.5     -0.050
-							-0.3     -0.025
-							-0.15    -0.010
-							-0.05    -0.005
-							 0.00     0.000
-							 0.05     0.005
-							 0.15     0.010
-							 0.3      0.025
-							 0.5      0.050
-							 0.7      0.100
-							 1.0      0.150
+							-1.0     -0.1500
+							-0.7     -0.1000
+							-0.5     -0.0500
+							-0.3     -0.0270
+							-0.15    -0.0140
+							-0.05    -0.0055
+							 0.00     0.0000
+							 0.05     0.0055
+							 0.15     0.0140
+							 0.3      0.0270
+							 0.5      0.0500
+							 0.7      0.1000
+							 1.0      0.1500
 							</tableData>
 						</table>
 					</sum>
@@ -100,9 +100,9 @@
 						<table>
 							<independentVar lookup="row">/controls/flight/elevator-input</independentVar>
 							<tableData>
-							-1.0      0.0755
-							-0.7      0.0535
-							-0.5      0.0225
+							-1.0      0.075
+							-0.7      0.053
+							-0.5      0.022
 							-0.3      0.0115
 							-0.15     0.0045
 							-0.05     0.0007
@@ -110,9 +110,9 @@
 							 0.05    -0.0007
 							 0.15    -0.0045
 							 0.3     -0.0115
-							 0.5     -0.0225
-							 0.7     -0.0535
-							 1.0     -0.0755
+							 0.5     -0.022
+							 0.7     -0.053
+							 1.0     -0.075
 							</tableData>
 						</table>
 					</sum>