diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml
index d60ada3a..b041023b 100644
--- a/Systems/a320-cfm56-5b4-engine-fadec.xml
+++ b/Systems/a320-cfm56-5b4-engine-fadec.xml
@@ -1334,6 +1334,72 @@
 			<output>/engines/engine[4]/n1</output>
 		</lag_filter>
 		
+		<fcs_function name="fadec/egt-cmd-1">
+			<function>
+				<sum>
+					<property>propulsion/tat-c</property>
+					<table>
+						<independentVar lookup="row">/engines/engine[0]/n2</independentVar>
+						<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+						<independentVar lookup="table">/controls/engines/engine[0]/cutoff</independentVar>
+						<tableData breakPoint="0">
+							         0    50000
+							 10.0    0    0
+							 45.0  390  345
+							 50.0  385  340
+							 59.4  330  290
+							105.0  650  550
+						</tableData>
+						<tableData breakPoint="1">
+							       0    50000
+							 30.0  0    0
+							 59.4  330  290
+							105.0  650  550
+						</tableData>
+					</table>
+				</sum>
+			</function>
+		</fcs_function>
+		
+		<lag_filter name="fadec/egt-actual-1">
+			<input>fadec/egt-cmd-1</input>
+			<c1>0.35</c1>
+			<output>/engines/engine[0]/egt-actual</output>
+		</lag_filter>
+		
+		<fcs_function name="fadec/egt-cmd-2">
+			<function>
+				<sum>
+					<property>propulsion/tat-c</property>
+					<table>
+						<independentVar lookup="row">/engines/engine[1]/n2</independentVar>
+						<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+						<independentVar lookup="table">/controls/engines/engine[1]/cutoff</independentVar>
+						<tableData breakPoint="0">
+							         0    50000
+							 10.0    0    0
+							 45.0  390  345
+							 50.0  385  340
+							 59.4  330  290
+							105.0  650  550
+						</tableData>
+						<tableData breakPoint="1">
+							       0    50000
+							 30.0  0    0
+							 59.4  330  290
+							105.0  650  550
+						</tableData>
+					</table>
+				</sum>
+			</function>
+		</fcs_function>
+		
+		<lag_filter name="fadec/egt-actual-2">
+			<input>fadec/egt-cmd-2</input>
+			<c1>0.35</c1>
+			<output>/engines/engine[1]/egt-actual</output>
+		</lag_filter>
+		
 		<lag_filter name="fadec/n2-actual-1">
 			<input>/engines/engine[0]/n2</input>
 			<c1>2.25</c1>
diff --git a/Systems/a320-v2527-a5-engine-fadec.xml b/Systems/a320-v2527-a5-engine-fadec.xml
index fd6fe741..1b8b444e 100644
--- a/Systems/a320-v2527-a5-engine-fadec.xml
+++ b/Systems/a320-v2527-a5-engine-fadec.xml
@@ -1947,6 +1947,72 @@
 			<output>/engines/engine[1]/epr-actual</output>
 		</fcs_function>
 		
+		<fcs_function name="fadec/egt-cmd-1">
+			<function>
+				<sum>
+					<property>propulsion/tat-c</property>
+					<table>
+						<independentVar lookup="row">/engines/engine[0]/n2</independentVar>
+						<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+						<independentVar lookup="table">/controls/engines/engine[0]/cutoff</independentVar>
+						<tableData breakPoint="0">
+							         0    50000
+							 10.0    0    0
+							 45.0  440  340
+							 50.0  435  335
+							 60.9  380  285
+							100.0  510  390
+						</tableData>
+						<tableData breakPoint="1">
+							       0    50000
+							 30.0  0    0
+							 60.9  380  265
+							100.0  510  370
+						</tableData>
+					</table>
+				</sum>
+			</function>
+		</fcs_function>
+		
+		<lag_filter name="fadec/egt-actual-1">
+			<input>fadec/egt-cmd-1</input>
+			<c1>0.35</c1>
+			<output>/engines/engine[0]/egt-actual</output>
+		</lag_filter>
+		
+		<fcs_function name="fadec/egt-cmd-2">
+			<function>
+				<sum>
+					<property>propulsion/tat-c</property>
+					<table>
+						<independentVar lookup="row">/engines/engine[1]/n2</independentVar>
+						<independentVar lookup="column">atmosphere/density-altitude</independentVar>
+						<independentVar lookup="table">/controls/engines/engine[1]/cutoff</independentVar>
+						<tableData breakPoint="0">
+							         0    50000
+							 10.0    0    0
+							 45.0  440  340
+							 50.0  435  335
+							 60.9  380  285
+							100.0  510  390
+						</tableData>
+						<tableData breakPoint="1">
+							       0    50000
+							 30.0  0    0
+							 60.9  380  285
+							100.0  510  390
+						</tableData>
+					</table>
+				</sum>
+			</function>
+		</fcs_function>
+		
+		<lag_filter name="fadec/egt-actual-2">
+			<input>fadec/egt-cmd-2</input>
+			<c1>0.35</c1>
+			<output>/engines/engine[1]/egt-actual</output>
+		</lag_filter>
+		
 		<lag_filter name="fadec/n2-actual-1">
 			<input>/engines/engine[0]/n2</input>
 			<c1>2.25</c1>
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index 1f94efce..97e503e0 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -1430,67 +1430,6 @@
 		<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>
-	
 	<filter>
 		<name>OIL PSI 1</name>
 		<type>gain</type>