diff --git a/A320neo-PW.xml b/A320neo-PW.xml
index 943e3097..9a15a4d7 100644
--- a/A320neo-PW.xml
+++ b/A320neo-PW.xml
@@ -276,6 +276,7 @@
 	<system file="glass-effect"/>
 	<system file="a320-fbw"/>
 	<system file="a320-fcs"/>
+	<system file="a320-cfm56-5b4-engine-fadec"/>
 	<system file="a320-fuel"/>
 	<system file="a320-fwc"/>
 	<system file="a320-fwc-phases"/>
diff --git a/Engines/pw1127g_1.xml b/Engines/pw1127g_1.xml
index 930f813b..549a7598 100644
--- a/Engines/pw1127g_1.xml
+++ b/Engines/pw1127g_1.xml
@@ -2,23 +2,23 @@
 
 <!-- Copyright (c) 2021 Josh Davidson (Octal450) -->
 
-<turbine_engine name="PW1127G">
+<turbine_engine name="CFM56-5B4">
 	
-	<milthrust>     27075 </milthrust>
-	<tsfc>          0.445 </tsfc>
-	<bleed>          0.03 </bleed>
-	<ignitionn1>	  0.6 </ignitionn1>
-	<ignitionn2>	 22.2</ignitionn2>
-	<idlen1>         18.9 </idlen1>
-	<idlen2>         59.4 </idlen2>
-	<n1spinup>       0.05 </n1spinup>
-	<n2spinup>       1.85 </n2spinup>
-	<n1startrate>   0.573 </n1startrate>
-	<n2startrate>   1.127 </n2startrate>
-	<maxn1>         103.8 </maxn1>
-	<maxn2>         101.4 </maxn2>
-	<augmented>         0 </augmented>
-	<injected>          0 </injected>
+	<milthrust>27000</milthrust>
+	<tsfc>0.445</tsfc>
+	<bleed>0.03</bleed>
+	<ignitionn1>0.6</ignitionn1>
+	<ignitionn2>22.2</ignitionn2>
+	<n1spinup>0.05</n1spinup>
+	<n2spinup>1.85</n2spinup>
+	<n1startrate>0.573</n1startrate>
+	<n2startrate>1.127</n2startrate>
+	<idlen1>18.9</idlen1>
+	<idlen2>59.4</idlen2>
+	<maxn1>104.0</maxn1>
+	<maxn2>105.0</maxn2>
+	<augmented>0</augmented>
+	<injected>0</injected>
 	
 	<function name="N1SpoolUp">
 		<table>
@@ -50,32 +50,32 @@
 		</table>
 	</function>
 	
-	<function name="N2SpoolUp">
+	<function name="N2SpoolUp"> <!-- N1 to N2 factor 0.535840188014101 -->
 		<table>
 			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
 			<tableData>
-				 24   1.1
-				 28   2.9
-				 46   9.7
-				 68  15.4
-				 80  19.6
-				 94  21.4
-				103  23.6
+				 24   0.6
+				 28   1.6
+				 46   5.2
+				 68   8.3
+				 80  10.5
+				 94  11.5
+				103  12.6
 			</tableData>
 		</table>
 	</function>
 	
-	<function name="N2SpoolDown">
+	<function name="N2SpoolDown"> <!-- N1 to N2 factor 0.535840188014101 -->
 		<table>
 			<independentVar lookup="row">/engines/engine[0]/n1</independentVar>
 			<tableData>
-				 24   1.1
-				 28   2.9
-				 46   9.7
-				 68  15.4
-				 80  19.6
-				 94  21.4
-				103  23.6
+				 24   0.6
+				 28   1.6
+				 46   5.2
+				 68   8.3
+				 80  10.5
+				 94  11.5
+				103  12.6
 			</tableData>
 		</table>
 	</function>
@@ -86,33 +86,43 @@
 			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
 			<tableData>
 				    -10000   0       10000   20000   30000   40000   50000
-				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
-				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
-				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
-				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
-				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
-				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0819  0.0793  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0727  0.0729  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0585  0.0671  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0416  0.0518  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0354  0.0468  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0352  0.0000
 			</tableData>
 		</table>
 	</function>
 	
-	<function name="MilThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-				     -10000   0       10000   20000   30000   40000   50000
-				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
-				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
-				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
-				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
-				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
-				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
-				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
-				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			</tableData>
-		</table>
+	<function name="MilThrust"> <!-- If you change this, make sure you update the table in the engine system file -->
+		<product>
+			<table>
+				<independentVar lookup="row">velocities/mach</independentVar>
+				<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+				<tableData>
+					    -10000   0       10000   20000   30000   40000   50000
+					0.0  1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+					0.2  1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+					0.4  1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+					0.6  1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+					0.8  1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+					0.9  1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+					1.0  1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+					1.2  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+					1.4  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				</tableData>
+			</table>
+			<property>fadec/limit/rated-thrust-factor</property>
+			<table> <!-- Thrust loss due to reverser angle -->
+				<independentVar lookup="row">/engines/engine[0]/reverser-pos-norm</independentVar>
+				<tableData>
+					0.01  1.00
+					1.00  0.65
+				</tableData>
+			</table>
+		</product>
 	</function>
 
 </turbine_engine>
diff --git a/Engines/pw1127g_2.xml b/Engines/pw1127g_2.xml
index fc0a0016..79c65063 100644
--- a/Engines/pw1127g_2.xml
+++ b/Engines/pw1127g_2.xml
@@ -2,23 +2,23 @@
 
 <!-- Copyright (c) 2021 Josh Davidson (Octal450) -->
 
-<turbine_engine name="PW1127G">
+<turbine_engine name="CFM56-5B4">
 	
-	<milthrust>     27075 </milthrust>
-	<tsfc>          0.445 </tsfc>
-	<bleed>          0.03 </bleed>
-	<ignitionn1>	  0.6 </ignitionn1>
-	<ignitionn2>	 22.2</ignitionn2>
-	<idlen1>         18.9 </idlen1>
-	<idlen2>         59.4 </idlen2>
-	<n1spinup>       0.05 </n1spinup>
-	<n2spinup>       1.85 </n2spinup>
-	<n1startrate>   0.573 </n1startrate>
-	<n2startrate>   1.127 </n2startrate>
-	<maxn1>         103.8 </maxn1>
-	<maxn2>         101.4 </maxn2>
-	<augmented>         0 </augmented>
-	<injected>          0 </injected>
+	<milthrust>27000</milthrust>
+	<tsfc>0.445</tsfc>
+	<bleed>0.03</bleed>
+	<ignitionn1>0.6</ignitionn1>
+	<ignitionn2>22.2</ignitionn2>
+	<n1spinup>0.05</n1spinup>
+	<n2spinup>1.85</n2spinup>
+	<n1startrate>0.573</n1startrate>
+	<n2startrate>1.127</n2startrate>
+	<idlen1>18.9</idlen1>
+	<idlen2>59.4</idlen2>
+	<maxn1>104.0</maxn1>
+	<maxn2>105.0</maxn2>
+	<augmented>0</augmented>
+	<injected>0</injected>
 	
 	<function name="N1SpoolUp">
 		<table>
@@ -50,32 +50,32 @@
 		</table>
 	</function>
 	
-	<function name="N2SpoolUp">
+	<function name="N2SpoolUp"> <!-- N1 to N2 factor 0.535840188014101 -->
 		<table>
 			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
 			<tableData>
-				 24   1.1
-				 28   2.9
-				 46   9.7
-				 68  15.4
-				 80  19.6
-				 94  21.4
-				103  23.6
+				 24   0.6
+				 28   1.6
+				 46   5.2
+				 68   8.3
+				 80  10.5
+				 94  11.5
+				103  12.6
 			</tableData>
 		</table>
 	</function>
 	
-	<function name="N2SpoolDown">
+	<function name="N2SpoolDown"> <!-- N1 to N2 factor 0.535840188014101 -->
 		<table>
 			<independentVar lookup="row">/engines/engine[1]/n1</independentVar>
 			<tableData>
-				 24   1.1
-				 28   2.9
-				 46   9.7
-				 68  15.4
-				 80  19.6
-				 94  21.4
-				103  23.6
+				 24   0.6
+				 28   1.6
+				 46   5.2
+				 68   8.3
+				 80  10.5
+				 94  11.5
+				103  12.6
 			</tableData>
 		</table>
 	</function>
@@ -86,33 +86,43 @@
 			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
 			<tableData>
 				    -10000   0       10000   20000   30000   40000   50000
-				0.0  0.0430  0.0458  0.0378  0.0684  0.0619  0.0693  0.0000
-				0.2  0.0500  0.0291  0.0205  0.0514  0.0627  0.0629  0.0000
-				0.4  0.0040  0.0047  0.0012  0.0412  0.0485  0.0571  0.0000
-				0.6  0.0000  0.0000  0.0000  0.0000  0.0316  0.0418  0.0000
-				0.8  0.0000  0.0000  0.0000  0.0000  0.0254  0.0368  0.0000
-				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0252  0.0000
+				0.0  0.0430  0.0458  0.0378  0.0684  0.0819  0.0793  0.0000
+				0.2  0.0500  0.0291  0.0205  0.0514  0.0727  0.0729  0.0000
+				0.4  0.0040  0.0047  0.0012  0.0412  0.0585  0.0671  0.0000
+				0.6  0.0000  0.0000  0.0000  0.0000  0.0416  0.0518  0.0000
+				0.8  0.0000  0.0000  0.0000  0.0000  0.0354  0.0468  0.0000
+				1.0  0.0000  0.0000  0.0000  0.0000  0.0000  0.0352  0.0000
 			</tableData>
 		</table>
 	</function>
 	
-	<function name="MilThrust">
-		<table>
-			<independentVar lookup="row">velocities/mach</independentVar>
-			<independentVar lookup="column">atmosphere/density-altitude</independentVar>
-			<tableData>
-				     -10000   0       10000   20000   30000   40000   50000
-				0.0   1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
-				0.2   1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
-				0.4   1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
-				0.6   1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
-				0.8   1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
-				0.9   1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
-				1.0   1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
-				1.2   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-				1.4   0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
-			</tableData>
-		</table>
+	<function name="MilThrust"> <!-- If you change this, make sure you update the table in the engine system file -->
+		<product>
+			<table>
+				<independentVar lookup="row">velocities/mach</independentVar>
+				<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+				<tableData>
+					    -10000   0       10000   20000   30000   40000   50000
+					0.0  1.2600  1.0000  0.7400  0.5640  0.3920  0.2710  0.0000
+					0.2  1.1710  0.9740  0.6970  0.5360  0.3850  0.2610  0.0000
+					0.4  1.1500  0.9570  0.6920  0.5460  0.3870  0.2530  0.0000
+					0.6  1.1810  0.9410  0.7210  0.5660  0.3580  0.2180  0.0000
+					0.8  1.2290  1.0200  0.7820  0.5570  0.3040  0.1930  0.0000
+					0.9  1.2580  1.0200  0.7820  0.5220  0.2710  0.1140  0.0000
+					1.0  1.1810  0.9510  0.7210  0.4410  0.1740  0.0450  0.0000
+					1.2  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+					1.4  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000  0.0000
+				</tableData>
+			</table>
+			<property>fadec/limit/rated-thrust-factor</property>
+			<table> <!-- Thrust loss due to reverser angle -->
+				<independentVar lookup="row">/engines/engine[1]/reverser-pos-norm</independentVar>
+				<tableData>
+					0.01  1.00
+					1.00  0.65
+				</tableData>
+			</table>
+		</product>
 	</function>
 
 </turbine_engine>
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index ca855aa5..78b4b04f 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -1015,8 +1015,8 @@ input = {
 	# EGT
 	egt_1: "/engines/engine[0]/egt-actual",
 	egt_2: "/engines/engine[1]/egt-actual",
-	egt_1_needle: "/ECAM/Upper/EGT[0]",
-	egt_2_needle: "/ECAM/Upper/EGT[1]",
+	egt_1_needle: "/instrumentation/upper-ecam/egt[0]",
+	egt_2_needle: "/instrumentation/upper-ecam/egt[1]",
 	
 	# N1 parameters
 	EPR_1: "/ECAM/Upper/EPR[0]",
diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml
index 9b3a7ca9..159a8f00 100644
--- a/Systems/a320-cfm56-5b4-engine-fadec.xml
+++ b/Systems/a320-cfm56-5b4-engine-fadec.xml
@@ -1428,6 +1428,32 @@
 				</table>
 			</function>
 		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/egt[0]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[0]/egt-actual</independentVar>
+					<tableData>
+						   0 -90
+						 500   0
+						1000  90
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="/instrumentation/upper-ecam/egt[1]">
+			<function>
+				<table>
+					<independentVar lookup="row">/engines/engine[1]/egt-actual</independentVar>
+					<tableData>
+						   0 -90
+						 500   0
+						1000  90
+					</tableData>
+				</table>
+			</function>
+		</fcs_function>
 	
 	</channel>
 
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index 114d6ed2..2dffb176 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -1223,5 +1223,66 @@
 		</input>
 		<output>/instrumentation/mk-viii/inputs/discretes/landing-flaps</output>
 	</logic>
+	
+	<!-- Redo this sh*t later -->
+	<filter>
+		<name>EGT L</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<enable>
+			<condition>
+				<and>
+					<equals>
+						<property>/engines/engine[0]/state</property>
+						<value>3</value>
+					</equals>
+					<greater-than-equals>
+						<property>/engines/engine[0]/n1-actual</property>
+						<property>/fdm/jsbsim/fadec/limit/min-n1</property>
+					</greater-than-equals>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[0]/n1-actual</property> 
+					<entry><ind> 18.9</ind><dep>434</dep></entry>
+					<entry><ind>110.0</ind><dep>620</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<output>/engines/engine[0]/egt-actual</output>
+	</filter>
+	
+	<filter>
+		<name>EGT R</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<enable>
+			<condition>
+				<and>
+					<equals>
+						<property>/engines/engine[1]/state</property>
+						<value>3</value>
+					</equals>
+					<greater-than-equals>
+						<property>/engines/engine[1]/n1-actual</property>
+						<property>/fdm/jsbsim/fadec/limit/min-n1</property>
+					</greater-than-equals>
+				</and>
+			</condition>
+		</enable>
+		<input>
+			<expression>
+				<table>
+					<property>/engines/engine[1]/n1-actual</property> 
+					<entry><ind> 18.9</ind><dep>434</dep></entry>
+					<entry><ind>110.0</ind><dep>620</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<output>/engines/engine[1]/egt-actual</output>
+	</filter>
 
 </PropertyList>
diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml
index dd113deb..a8c38000 100644
--- a/Systems/upper-ecam.xml
+++ b/Systems/upper-ecam.xml
@@ -139,84 +139,6 @@
 		<output>/ECAM/Upper/EPRylim</output>
 	</filter>
 	
-	<filter>
-		<name>EGT 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>CFM</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[0]/egt-actual</property>
-					<entry><ind>   0</ind><dep>-90</dep></entry>
-					<entry><ind> 500</ind><dep>  0</dep></entry>
-					<entry><ind>1000</ind><dep> 90</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[0]/egt-actual</property>
-					<entry><ind>  0</ind><dep>-90</dep></entry>
-					<entry><ind>400</ind><dep>  0</dep></entry>
-					<entry><ind>800</ind><dep> 90</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/ECAM/Upper/EGT[0]</output>
-	</filter>
-	
-	<filter>
-		<name>EGT 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>CFM</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[1]/egt-actual</property>
-					<entry><ind>   0</ind><dep>-90</dep></entry>
-					<entry><ind> 500</ind><dep>  0</dep></entry>
-					<entry><ind>1000</ind><dep> 90</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/options/eng</property>
-					<value>IAE</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/engines/engine[1]/egt-actual</property>
-					<entry><ind>  0</ind><dep>-90</dep></entry>
-					<entry><ind>400</ind><dep>  0</dep></entry>
-					<entry><ind>800</ind><dep> 90</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/ECAM/Upper/EGT[1]</output>
-	</filter>
-	
 	<!--filter>
 		<name>N1 1</name>
 		<type>gain</type>