diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/FreightCabin.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/FreightCabin.xml
new file mode 100644
index 0000000..140bdfd
--- /dev/null
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/FreightCabin.xml
@@ -0,0 +1,186 @@
+<ModelBehaviors>
+	<Include RelativeFile="..\Templates\Cabin.xml"/>
+	<Include RelativeFile="..\Templates\FlightDeck.xml"/>
+	<Include RelativeFile="FreightCabinFrame.xml"/>
+	<Include RelativeFile="CabinInteractions.xml"/>
+	<Template Name="MD11_FreightCabin">
+		<UseTemplate Name="MD11_Cabin_Interactions"/>
+		<Component ID="MD11_Cabin_Lights_Emis">
+			<UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_R_wall_seg1</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_R_wall_seg2</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_R_wall_seg3</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_R_wall_seg4</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_R_wall_seg5</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_R_wall_seg6</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_R_wall_seg7</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_R_wall_seg8</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_L_wall_seg1</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_L_wall_seg002</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_L_wall_seg003</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_L_wall_seg004</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_L_wall_seg005</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_L_wall_seg006</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_L_wall_seg007</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_L_wall_seg008</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_overhead_lights_1</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_overhead_lights_2</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_overhead_lights_3</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_overhead_lights_4</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_overhead_lights_5</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_overhead_lights_6</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>md11f_cabin_overhead_lights_7</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>Plane71298</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+            <UseTemplate Name="MD11_Cabin_Lighting">
+				<NODE_ID>Plane71297</NODE_ID>
+				<VAR_NAME>LIGHT POTENTIOMETER</VAR_NAME>
+				<INDEX>20</INDEX>
+				<UNITS>percent over 100</UNITS>
+				<INTENSITY>5.0</INTENSITY>
+			</UseTemplate>
+		</Component>
+	</Template>
+</ModelBehaviors>
\ No newline at end of file
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/FreightCabinFrame.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/FreightCabinFrame.xml
index 5a15aee..ec1ccdf 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/FreightCabinFrame.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/FreightCabinFrame.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModelBehaviors>
   <Template Name="Invernyx_MD11_CabinF">
-    <!-- NOTE: 106FIX - Adjusted Node Name -->
     <UseTemplate Name="Invernyx_MD11_Button_Template">
       <NODE_ID>MD11_EXT_DOOR_PAX_1R_ARMED_LVR_OBJ</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_1R_ARMED_LVR</ANIM_NAME>
@@ -11,7 +10,6 @@
       <ANIM_SCALAR>10</ANIM_SCALAR>
       <LEFT_BUTTON_DOWN>102400</LEFT_BUTTON_DOWN>
     </UseTemplate>
-    <!-- NOTE: 106FIX - Adjusted Node Name -->
     <UseTemplate Name="Invernyx_MD11_Button_Template">
       <NODE_ID>MD11_EXT_DOOR_PAX_1L_ARMED_LVR_OBJ</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_1L_ARMED_LVR</ANIM_NAME>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/PaxCabinFrame.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/PaxCabinFrame.xml
index 9e9dcbb..46ad725 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/PaxCabinFrame.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Cabin/PaxCabinFrame.xml
@@ -2,7 +2,7 @@
 <ModelBehaviors>
   <Template Name="Invernyx_MD11_CabinPax">
     <UseTemplate Name="Invernyx_MD11_Button_Template">
-      <NODE_ID>Line4088</NODE_ID>
+      <NODE_ID>Cylinder11813</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_1R_ARMED_LVR</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
       <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
@@ -11,21 +11,21 @@
       <LEFT_BUTTON_DOWN>102400</LEFT_BUTTON_DOWN>
     </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Button_Template">
-      <NODE_ID>Cylinder12040</NODE_ID>
+      <NODE_ID>Cylinder12038</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_2R_ARMED_LVR</ANIM_NAME>
+      <ANIM_CODE>(L:MD11_EXT_DOOR_PAX_2R_ARMED_LVR) ! 10 *</ANIM_CODE>
       <ANIM_LENGTH>10</ANIM_LENGTH>
-      <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
-      <ANIM_LAG>100</ANIM_LAG>
       <ANIM_SCALAR>10</ANIM_SCALAR>
+      <ANIM_LAG>100</ANIM_LAG>
       <LEFT_BUTTON_DOWN>102401</LEFT_BUTTON_DOWN>
     </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Button_Template">
       <NODE_ID>Cylinder12058</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_3R_ARMED_LVR</ANIM_NAME>
+      <ANIM_CODE>(L:MD11_EXT_DOOR_PAX_3R_ARMED_LVR) ! 10 *</ANIM_CODE>
       <ANIM_LENGTH>10</ANIM_LENGTH>
-      <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
-      <ANIM_LAG>100</ANIM_LAG>
       <ANIM_SCALAR>10</ANIM_SCALAR>
+      <ANIM_LAG>100</ANIM_LAG>
       <LEFT_BUTTON_DOWN>102402</LEFT_BUTTON_DOWN>
     </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Button_Template">
@@ -38,7 +38,7 @@
       <LEFT_BUTTON_DOWN>102403</LEFT_BUTTON_DOWN>
     </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Button_Template">
-      <NODE_ID>Line4092</NODE_ID>
+      <NODE_ID>Cylinder11904</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_1L_ARMED_LVR</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
       <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
@@ -49,23 +49,23 @@
     <UseTemplate Name="Invernyx_MD11_Button_Template">
       <NODE_ID>Cylinder12061</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_2L_ARMED_LVR</ANIM_NAME>
+      <ANIM_CODE>(L:MD11_EXT_DOOR_PAX_2L_ARMED_LVR) ! 10 *</ANIM_CODE>
       <ANIM_LENGTH>10</ANIM_LENGTH>
-      <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
-      <ANIM_LAG>100</ANIM_LAG>
       <ANIM_SCALAR>10</ANIM_SCALAR>
+      <ANIM_LAG>100</ANIM_LAG>
       <LEFT_BUTTON_DOWN>102405</LEFT_BUTTON_DOWN>
     </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Button_Template">
       <NODE_ID>Cylinder12064</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_3L_ARMED_LVR</ANIM_NAME>
+      <ANIM_CODE>(L:MD11_EXT_DOOR_PAX_3L_ARMED_LVR) ! 10 *</ANIM_CODE>
       <ANIM_LENGTH>10</ANIM_LENGTH>
-      <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
-      <ANIM_LAG>100</ANIM_LAG>
       <ANIM_SCALAR>10</ANIM_SCALAR>
+      <ANIM_LAG>100</ANIM_LAG>
       <LEFT_BUTTON_DOWN>102406</LEFT_BUTTON_DOWN>
     </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Button_Template">
-      <NODE_ID>Line4100_23</NODE_ID>
+      <NODE_ID>Cylinder12057_08</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_4L_ARMED_LVR</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
       <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
@@ -264,15 +264,15 @@
     <UseTemplate Name="Invernyx_MD11_Annunciator">
       <NODE_ID>MD11_CABIN_OXY_MASKS</NODE_ID>
     </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Range_Template">
-      <NODE_ID>Cylinder12038</NODE_ID>
+    <UseTemplate Name="MD11_Animation">
+      <NODE_ID>MD11_EXT_DOOR_PAX_2R_ARMED_DRUM</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_2R_ARMED_DRUM</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
       <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
       <ANIM_LAG>100</ANIM_LAG>
       <ANIM_SCALAR>1</ANIM_SCALAR>
     </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Range_Template">
+    <UseTemplate Name="MD11_Animation">
       <NODE_ID>MD11_EXT_DOOR_PAX_3R_ARMED_DRUM</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_3R_ARMED_DRUM</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
@@ -280,16 +280,16 @@
       <ANIM_LAG>100</ANIM_LAG>
       <ANIM_SCALAR>1</ANIM_SCALAR>
     </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Range_Template">
-      <NODE_ID>Cylinder12061</NODE_ID>
+    <UseTemplate Name="MD11_Animation">
+      <NODE_ID>MD11_EXT_DOOR_PAX_2L_ARMED_DRUM</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_2L_ARMED_DRUM</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
       <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
       <ANIM_LAG>100</ANIM_LAG>
       <ANIM_SCALAR>1</ANIM_SCALAR>
     </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Range_Template">
-      <NODE_ID>Cylinder12064</NODE_ID>
+    <UseTemplate Name="MD11_Animation">
+      <NODE_ID>MD11_EXT_DOOR_PAX_3L_ARMED_DRUM</NODE_ID>
       <ANIM_NAME>MD11_EXT_DOOR_PAX_3L_ARMED_DRUM</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
       <ANIM_KEYFRAME_SCALAR>10</ANIM_KEYFRAME_SCALAR>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/AftFootPedestal.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/AftFootPedestal.xml
index b394859..6335430 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/AftFootPedestal.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/AftFootPedestal.xml
@@ -1380,32 +1380,29 @@
       <LEFT_BUTTON_DOWN>69814</LEFT_BUTTON_DOWN>
       <RIGHT_BUTTON_DOWN>69815</RIGHT_BUTTON_DOWN>
     </UseTemplate>
-    <!-- NOTE: 106FIX - Flipped animation to match CONFIG -->
     <UseTemplate Name="Invernyx_MD11_3Pos_Knob_Hold">
       <NODE_ID>MD11_PED_RUD_TRIM_SW</NODE_ID>
       <ANIM_NAME>MD11_PED_RUD_TRIM_SW</ANIM_NAME>
       <ANIM_LENGTH>50</ANIM_LENGTH>
-      <ANIM_KEYFRAME_SCALAR>50</ANIM_KEYFRAME_SCALAR>
       <ANIM_LAG>500</ANIM_LAG>
       <ANIM_SCALAR>25</ANIM_SCALAR>
       <ANIM_CODE>50 (L:MD11_PED_RUD_TRIM_SW) 25 * -</ANIM_CODE>
-      <NUM_STATES>2</NUM_STATES>
       <LEFT_BUTTON_DOWN>69850</LEFT_BUTTON_DOWN>
       <LEFT_BUTTON_UP>69851</LEFT_BUTTON_UP>
       <RIGHT_BUTTON_DOWN>69848</RIGHT_BUTTON_DOWN>
       <RIGHT_BUTTON_UP>69849</RIGHT_BUTTON_UP>
+      <NUM_STATES>2</NUM_STATES>
     </UseTemplate>
-    <!-- NOTE: 106FIX - Flipped interaction -->
     <UseTemplate Name="Invernyx_MD11_Switch_Template">
       <NODE_ID>MD11_PED_XPNDR_ABV_BLW_SW</NODE_ID>
-      <ANIM_CODE>(L:MD11_PED_XPNDR_ABV_BLW_SW, enum) 5 *</ANIM_CODE>
-      <ANIM_NAME>MD11_PED_XPNDR_ABV_BLW_SW</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
       <ANIM_SCALAR>5</ANIM_SCALAR>
       <ANIM_LAG>100</ANIM_LAG>
       <NUM_STATES>2</NUM_STATES>
+      <ANIM_CODE>(L:MD11_PED_XPNDR_ABV_BLW_SW, enum) 5 *</ANIM_CODE>
       <LEFT_BUTTON_DOWN>69875</LEFT_BUTTON_DOWN>
       <RIGHT_BUTTON_DOWN>69874</RIGHT_BUTTON_DOWN>
+      <ANIM_NAME>MD11_PED_XPNDR_ABV_BLW_SW</ANIM_NAME>
     </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Switch_SingleEvent_Template">
       <NODE_ID>MD11_PED_ADG_LVR</NODE_ID>
@@ -2241,15 +2238,13 @@
     <UseTemplate Name="Invernyx_MD11_Annunciator">
       <NODE_ID>MD11_PED_CKPTDOOR_AUTO_LT</NODE_ID>
     </UseTemplate>
-    <!-- NOTE: 106FIX - Flipped animation to match CONFIG -->
     <UseTemplate Name="MD11_Animation">
       <NODE_ID>MD11_PED_RUD_TRIM_IND</NODE_ID>
-      <ANIM_NAME>MD11_PED_RUD_TRIM_IND</ANIM_NAME>
       <ANIM_LENGTH>50</ANIM_LENGTH>
       <ANIM_KEYFRAME_SCALAR>50</ANIM_KEYFRAME_SCALAR>
       <ANIM_LAG>500</ANIM_LAG>
-      <ANIM_SCALAR>1</ANIM_SCALAR>
       <ANIM_CODE>50 (L:MD11_PED_RUD_TRIM_IND) -</ANIM_CODE>
+      <ANIM_SCALAR>1</ANIM_SCALAR>
     </UseTemplate>
     <UseTemplate Name="MD11_Animation">
       <NODE_ID>MD11_PED_AIL_TRIM_IND</NODE_ID>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CenterInstrument.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CenterInstrument.xml
index adcb478..25a177e 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CenterInstrument.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CenterInstrument.xml
@@ -29,15 +29,14 @@
       <ANIM_LAG>100</ANIM_LAG>
       <ANIM_SCALAR>10</ANIM_SCALAR>
     </UseTemplate>
-    <!-- NOTE: 106FIX - Changed template, Added animation -->
     <UseTemplate Name="Invernyx_MD11_Knob_Push">
       <NODE_ID>MD11_MIP_ISFD_BARO_KB</NODE_ID>
       <ANIM_CODE_KNOB>(L:MD11_MIP_ISFD_BARO_KB)</ANIM_CODE_KNOB>
       <ANIM_NAME_PUSH>MD11_MIP_ISFD_STD_BT</ANIM_NAME_PUSH>
       <ANIM_CODE_PUSH>(L:MD11_MIP_ISFD_STD_BT, enum) 10 *</ANIM_CODE_PUSH>
-      <ANIM_SCALAR>1.014084</ANIM_SCALAR>
-      <THRESHOLD_MOUSE>0.01014084</THRESHOLD_MOUSE>
-      <NUM_STATES>3</NUM_STATES>
+      <ANIM_LENGTH>72</ANIM_LENGTH>
+      <ANIM_SCALAR>72</ANIM_SCALAR>
+      <ANIM_LAG>720</ANIM_LAG>
       <LEFT_BUTTON_DOWN>94991</LEFT_BUTTON_DOWN>
       <LEFT_BUTTON_UP>95002</LEFT_BUTTON_UP>
       <WHEEL_UP>95003</WHEEL_UP>
@@ -99,30 +98,6 @@
     <UseTemplate Name="Invernyx_MD11_Annunciator">
       <NODE_ID>MD11_MIP_CTR_GEAR_LT</NODE_ID>
     </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Annunciator">
-      <NODE_ID>MD11_MIP_NOSE_RED_LT</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Annunciator">
-      <NODE_ID>MD11_MIP_NOSE_GREEN_LT</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Annunciator">
-      <NODE_ID>MD11_MIP_LEFT_RED_LT</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Annunciator">
-      <NODE_ID>MD11_MIP_LEFT_GREEN_LT</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Annunciator">
-      <NODE_ID>MD11_MIP_CTR_RED_LT</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Annunciator">
-      <NODE_ID>MD11_MIP_CTR_GREEN_LT</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Annunciator">
-      <NODE_ID>MD11_MIP_RIGHT_RED_LT</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_Annunciator">
-      <NODE_ID>MD11_MIP_RIGHT_GREEN_LT</NODE_ID>
-    </UseTemplate>
     <UseTemplate Name="MD11_Animation">
       <NODE_ID>MD11_MIP_STBY_ALT_10K_RNG</NODE_ID>
       <ANIM_NAME>MD11_MIP_STBY_ALT_10K_RNG</ANIM_NAME>
@@ -260,5 +235,45 @@
       <ANIM_SCALAR>10</ANIM_SCALAR>
       <LEFT_BUTTON_DOWN>94979</LEFT_BUTTON_DOWN>
     </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Landing_Gear_Light_Container">
+      <POS>NOSE</POS>
+      <OLD_NEUTRAL>MD11_MIP_NOSE_NEUTRAL_LT</OLD_NEUTRAL>
+      <NEW_NEUTRAL>MD11_MIP_NOSE_LT_NEW</NEW_NEUTRAL>
+      <OLD_RED>MD11_MIP_NOSE_RED_LT</OLD_RED>
+      <NEW_RED>MD11_MIP_NOSE_NEW_RED_LT</NEW_RED>
+      <OLD_GREEN>MD11_MIP_NOSE_GREEN_LT</OLD_GREEN>
+      <NEW_GREEN>MD11_MIP_NOSE_NEW_GREEN_LT</NEW_GREEN>
+      <NODE_ID></NODE_ID>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Landing_Gear_Light_Container">
+      <POS>LEFT</POS>
+      <OLD_NEUTRAL>MD11_MIP_LEFT_NEUTRAL_LT</OLD_NEUTRAL>
+      <NEW_NEUTRAL>MD11_MIP_LEFT_LT_NEW</NEW_NEUTRAL>
+      <OLD_RED>MD11_MIP_LEFT_RED_LT</OLD_RED>
+      <NEW_RED>MD11_MIP_LEFT_NEW_RED_LT</NEW_RED>
+      <OLD_GREEN>MD11_MIP_LEFT_GREEN_LT</OLD_GREEN>
+      <NEW_GREEN>MD11_MIP_LEFT_NEW_GREEN_LT</NEW_GREEN>
+      <NODE_ID></NODE_ID>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Landing_Gear_Light_Container">
+      <POS>CTR</POS>
+      <OLD_NEUTRAL>MD11_MIP_CTR_NEUTRAL_LT</OLD_NEUTRAL>
+      <NEW_NEUTRAL>MD11_MIP_CTR_LT_NEW</NEW_NEUTRAL>
+      <OLD_RED>MD11_MIP_CTR_RED_LT</OLD_RED>
+      <NEW_RED>MD11_MIP_CTR_NEW_RED_LT</NEW_RED>
+      <OLD_GREEN>MD11_MIP_CTR_GREEN_LT</OLD_GREEN>
+      <NEW_GREEN>MD11_MIP_CTR_NEW_GREEN_LT</NEW_GREEN>
+      <NODE_ID></NODE_ID>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Landing_Gear_Light_Container">
+      <POS>RIGHT</POS>
+      <OLD_NEUTRAL>MD11_MIP_RIGHT_NEUTRAL_LT</OLD_NEUTRAL>
+      <NEW_NEUTRAL>MD11_MIP_RIGHT_LT_NEW</NEW_NEUTRAL>
+      <OLD_RED>MD11_MIP_RIGHT_RED_LT</OLD_RED>
+      <NEW_RED>MD11_MIP_RIGHT_NEW_RED_LT</NEW_RED>
+      <OLD_GREEN>MD11_MIP_RIGHT_GREEN_LT</OLD_GREEN>
+      <NEW_GREEN>MD11_MIP_RIGHT_NEW_GREEN_LT</NEW_GREEN>
+      <NODE_ID></NODE_ID>
+    </UseTemplate>
   </Template>
 </ModelBehaviors>
\ No newline at end of file
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/RObserverLowerMaintenance.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/RObserverLowerMaintenance.xml
index fa29e65..dc6dbc7 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/RObserverLowerMaintenance.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/RObserverLowerMaintenance.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModelBehaviors>
   <Template Name="Invernyx_MD11_RObserverLowerMaintenance">
-    <!-- NOTE: 106FIX - Added animation -->
     <UseTemplate Name="Invernyx_MD11_Knob_Template">
       <NODE_ID>MD11_OBS_CKTBKR_LT_KB</NODE_ID>
       <ANIM_NAME>MD11_OBS_CKTBKR_LT_KB</ANIM_NAME>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/MD11_Exterior.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/MD11_Exterior.xml
index 39ba6e9..01dbc71 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/MD11_Exterior.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/MD11_Exterior.xml
@@ -78,89 +78,6 @@
     <UseTemplate Name="Invernyx_MD11_Vistag">
       <NODE_ID>MD11_CARGO_PALLET_22</NODE_ID>
     </UseTemplate>
-    <!-- NOTE: 106FIX - Added -->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>l_PIPfairing_inbd002</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_PIP_PYLON)</VIS_CODE>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added -->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>l_PIPfairing_outbd002</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_PIP_PYLON)</VIS_CODE>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added -->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>r_PIPfairing_inbd</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_PIP_PYLON)</VIS_CODE>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added -->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>r_PIPfairing_outbd</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_PIP_PYLON)</VIS_CODE>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added-->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>l_flap_outbd_fairing1</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_NO_PIP_PYLON)</VIS_CODE>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added-->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>l_flap_outbd_fairing2</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_NO_PIP_PYLON)</VIS_CODE>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added-->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>r_flap_outbd_fairing1</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_NO_PIP_PYLON)</VIS_CODE>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added-->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>r_flap_outbd_fairing2</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_NO_PIP_PYLON)</VIS_CODE>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_NAV</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_BCN</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_HI_INT</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_LOGO</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_TURNOFF_L</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_TURNOFF_R</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_NOSE_TAXI</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_NOSE_TO</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_LDG_L</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_LDG_R</NODE_ID>
-    </UseTemplate>
-    <UseTemplate Name="Invernyx_MD11_ExtLight">
-      <NODE_ID>MD11_LTS_EXT_HI_INT_BACK</NODE_ID>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added-->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>Plane2500</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_GUARDIAN)</VIS_CODE>
-    </UseTemplate>
-    <!-- NOTE: 106FIX - Added-->
-    <UseTemplate Name="Invernyx_MD11_Vistag">
-      <NODE_ID>Sphere011</NODE_ID>
-      <VIS_CODE>(L:MD11_OPT_GUARDIAN)</VIS_CODE>
-    </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Vistag">
       <NODE_ID>MD11_EXT_TIRE_NOSE_1_STD</NODE_ID>
     </UseTemplate>
@@ -719,6 +636,71 @@
       <NODE_ID>grnd_obj_move2</NODE_ID>
       <VIS_CODE>(L:MD11_EXT_CHOCKS, bool)</VIS_CODE>
     </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>Plane2500</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_GUARDIAN)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>Sphere011</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_GUARDIAN)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>l_PIPfairing_inbd002</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_PIP_PYLON)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>l_PIPfairing_outbd002</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_PIP_PYLON)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>r_PIPfairing_inbd</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_PIP_PYLON)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>r_PIPfairing_outbd</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_PIP_PYLON)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>l_flap_outbd_fairing1</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_NO_PIP_PYLON)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>l_flap_outbd_fairing2</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_NO_PIP_PYLON)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>r_flap_outbd_fairing1</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_NO_PIP_PYLON)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="Invernyx_MD11_Vistag">
+      <NODE_ID>r_flap_outbd_fairing2</NODE_ID>
+      <VIS_CODE>(L:MD11_OPT_NO_PIP_PYLON)</VIS_CODE>
+    </UseTemplate>
+    <UseTemplate Name="ASOBO_GT_Anim_Code">
+      <ANIM_CODE>
+				(A:GEAR CENTER STEER ANGLE, grads) 0 &gt;
+				if{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * }
+				els{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * 200 + }
+			</ANIM_CODE>
+      <ANIM_LENGTH>200</ANIM_LENGTH>
+      <ANIM_NAME>c_wheel</ANIM_NAME>
+      <ANIM_LAG>0</ANIM_LAG>
+      <NODE_ID></NODE_ID>
+    </UseTemplate>
+    <UseTemplate Name="ASOBO_GT_Anim_Code">
+      <ANIM_NAME>l_wing_flex</ANIM_NAME>
+      <ANIM_CODE>(A:WING FLEX PCT:1, percent) 0.5 * 50 +</ANIM_CODE>
+      <ANIM_LENGTH>100</ANIM_LENGTH>
+      <ANIM_LAG>0</ANIM_LAG>
+      <NODE_ID></NODE_ID>
+    </UseTemplate>
+    <UseTemplate Name="ASOBO_GT_Anim_Code">
+      <ANIM_NAME>r_wing_flex</ANIM_NAME>
+      <ANIM_CODE>(A:WING FLEX PCT:2, percent) 0.5 * 50 +</ANIM_CODE>
+      <ANIM_LENGTH>100</ANIM_LENGTH>
+      <ANIM_LAG>0</ANIM_LAG>
+      <NODE_ID></NODE_ID>
+    </UseTemplate>
     <UseTemplate Name="Invernyx_MD11_Vistag">
       <NODE_ID>light_l_wing_src</NODE_ID>
       <VIS_CODE>(L:MD11_LTS_EXT_TURNOFF_L, bool)</VIS_CODE>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Templates/FlightDeck.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Templates/FlightDeck.xml
index 3b7e970..0a14356 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Templates/FlightDeck.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/Templates/FlightDeck.xml
@@ -816,6 +816,71 @@
 			</Material>
 		</Component>
 	</Template>
+	<Template Name="Invernyx_MD11_Landing_Gear_Light">
+		<Parameters Type="Default">
+			<VAR_NAME>MD11_LTS_BRT_DIM</VAR_NAME>
+			<INTENSITY>1.8</INTENSITY>
+			<STYLE_VAR>MD11_OPT_#STYLE#_GEAR_LT</STYLE_VAR>
+		</Parameters>
+		<Component ID="MD11_LandingLight_#POS#_#STYLE#_NEUTRAL" Node="#NODE_NEUTRAL#">
+			<UseTemplate Name="ASOBO_GT_Part_ID"/>
+			<Visibility>
+				<Parameter>
+					<Code>(L:#STYLE_VAR#, bool)</Code>
+				</Parameter>
+			</Visibility>
+		</Component>
+		<Component ID="MD11_LandingLight_#POS#_#STYLE#_RED" Node="#NODE_RED#">
+			<UseTemplate Name="ASOBO_GT_Part_ID"/>
+			<Visibility>
+				<Parameter>
+					<Code>(L:MD11_MIP_#POS#_RED_LT, bool) (L:#STYLE_VAR#, bool) &</Code>
+				</Parameter>
+			</Visibility>
+			<Material>
+				<EmissiveFactor>
+					<Parameter>
+						<Code>(L:#VAR_NAME#, percent over 100) 2.7 pow #INTENSITY# *</Code>
+					</Parameter>
+					<OverrideBaseEmissive>True</OverrideBaseEmissive>
+				</EmissiveFactor>
+			</Material>
+		</Component>
+		<Component ID="MD11_LandingLight_#POS#_#STYLE#_GREEN" Node="#NODE_GREEN#">
+			<UseTemplate Name="ASOBO_GT_Part_ID"/>
+			<Visibility>
+				<Parameter>
+					<Code>(L:MD11_MIP_#POS#_GREEN_LT, bool) (L:#STYLE_VAR#, bool) &</Code>
+				</Parameter>
+			</Visibility>
+			<Material>
+				<EmissiveFactor>
+					<Parameter>
+						<Code>(L:#VAR_NAME#, percent over 100) 2.7 pow #INTENSITY# *</Code>
+					</Parameter>
+					<OverrideBaseEmissive>True</OverrideBaseEmissive>
+				</EmissiveFactor>
+			</Material>
+		</Component>
+	</Template>
+	<Template Name="Invernyx_MD11_Landing_Gear_Light_Container">
+		<Component ID="MD11_LandingLight_#POS#">
+			<UseTemplate Name="Invernyx_MD11_Landing_Gear_Light">
+				<POS>#POS#</POS>
+				<NODE_NEUTRAL>#OLD_NEUTRAL#</NODE_NEUTRAL>
+				<NODE_RED>#OLD_RED#</NODE_RED>
+				<NODE_GREEN>#OLD_GREEN#</NODE_GREEN>
+				<STYLE>OLD</STYLE>
+			</UseTemplate>
+			<UseTemplate Name="Invernyx_MD11_Landing_Gear_Light">
+				<POS>#POS#</POS>
+				<NODE_NEUTRAL>#NEW_NEUTRAL#</NODE_NEUTRAL>
+				<NODE_RED>#NEW_RED#</NODE_RED>
+				<NODE_GREEN>#NEW_GREEN#</NODE_GREEN>
+				<STYLE>NEW</STYLE>
+			</UseTemplate>
+		</Component>
+	</Template>
 	<Template Name="Invernyx_MD11_Vistag">
 		<Parameters Type="Override">
 			<Condition Check="VIS_CODE">
diff --git a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model/TFDi_MD11_F_EXT.xml b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model/TFDi_MD11_F_EXT.xml
deleted file mode 100644
index fd647ec..0000000
--- a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model/TFDi_MD11_F_EXT.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ModelInfo>
-	<LODS>
-		<LOD minSize="150" ModelFile="TFDi_MD11_F_EXT_LOD0.gltf">
-			<MergeModel>..\..\TFDi_Design_MD-11F_GE\model\TFDi_MD11_ENG_GE_LOD0.gltf</MergeModel>
-		</LOD>
-	</LODS>
-<Behaviors>
-<Include ModelBehaviorFile="Asobo\Exterior.xml"/>
-<Include ModelBehaviorFile="Asobo\Common.xml"/>
-<Include ModelBehaviorFile="Asobo\Generic\FX.xml"/>
-<Include ModelBehaviorFile="TFDi_Design\MD11\Templates\FlightDeck.xml"/>
-<Include ModelBehaviorFile="TFDi_Design\MD11\MD11_Exterior.xml"/>
-<Component ID="TFDi_MD11_Exterior_Core">
-<UseTemplate Name="Invernyx_MD11_Exterior"/>
-</Component>
-<!-- Begin Templates -->
-
-<!-- <Template Name="MD11_N1_Slow">
-	<DefaultTemplateParameters>
-		<NODE_ID/>
-		<VAR_NAME/>
-		<MAX_N1>5.0</MAX_N1>
-	</DefaultTemplateParameters>
-
-	<Component ID="MD11_ENG_N1_#NODE_ID#" Node="#NODE_ID#">
-		<UseTemplate Name="ASOBO_GT_Part_ID"/>
-		<Material>
-			<EmissiveFactor>
-				<Parameter>
-					<Code>(L:#VAR_NAME#, enum) 0.1 * #INTENSITY# * </Code>
-				</Parameter>
-				<OverrideBaseEmissive>True</OverrideBaseEmissive>
-			</EmissiveFactor>
-		</Material>
-	</Component>
-</Template> -->
-
-<Template Name="MD11_N1_Template">
-		<DefaultTemplateParameters>
-			<ANIM_NAME/>
-			<ANIM_LENGTH>360</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-			<ANIM_WRAP>True</ANIM_WRAP>
-			<ANIM_DELTA>True</ANIM_DELTA>
-			<NODE_ID_STILL/>
-			<NODE_ID_BLURRED/>
-			<VAR_NAME>#VAR_NAME#</VAR_NAME>
-			<MAX_RPM/>
-		</DefaultTemplateParameters>
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_CODE>(L:#VAR_NAME#, degrees)</ANIM_CODE>
-			<ANIM_NAME>#ANIM_NAME#</ANIM_NAME>
-			<ANIM_LENGTH>#ANIM_LENGTH#</ANIM_LENGTH>
-			<ANIM_LAG>#ANIM_LAG#</ANIM_LAG>
-			<ANIM_WRAP>#ANIM_WRAP#</ANIM_WRAP>
-			<ANIM_DELTA>#ANIM_DELTA#</ANIM_DELTA>
-		</UseTemplate>
-		<Component ID="MD11_#NODE_ID_STILL#" Node="#NODE_ID_STILL#">
-			<UseTemplate Name="ASOBO_GT_Visibility_Code">
-				<VISIBILITY_CODE>(A:ENGINE N1 RPM:1, percent) 10 &lt; if{ 1 } els{ 0 } </VISIBILITY_CODE>
-			</UseTemplate>
-		</Component>
-	</Template>
-
-<!-- End Templates -->
-	
-	<Component ID="Pilot_Visibility" Node="PILOT_0">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>(A:CAMERA STATE, enum) 2 == ; if{ 0 } els{ 1 } </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Copilot_Visibility" Node="PILOT_1">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>(A:CAMERA STATE, enum) 2 == ; if{ 0 } els{ 1 } </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="ADG_Deploy">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_ADG_DEPLOY</ANIM_NAME>
-			<ANIM_LENGTH>50</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_PED_ADG_LVR, enum) 50 * </ANIM_CODE>
-			<ANIM_LAG>50</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="GPU_Door">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_GPU_DOOR</ANIM_NAME>
-			<ANIM_LENGTH>10</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_EXT_GPU, bool) 10 * </ANIM_CODE>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_1">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_N1_1_STILL</ANIM_NAME>
-			<ANIM_LENGTH>360</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_ENG_1_N1_ANG, degrees)</ANIM_CODE>
-			<ANIM_LAG>3600</ANIM_LAG>
-			<ANIM_WRAP>True</ANIM_WRAP>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_1_blurred" Node="N1_1_blurred_GE">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>
-                (A:ENG N1 RPM:1, percent) 5.0 &gt; if{ 1 } els{ 0 }
-            </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-		
-	<Component ID="Engine_Fans_2">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_N1_2_STILL</ANIM_NAME>
-			<ANIM_LENGTH>360</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_ENG_2_N1_ANG, degrees)</ANIM_CODE>
-			<ANIM_LAG>3600</ANIM_LAG>
-			<ANIM_WRAP>True</ANIM_WRAP>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_2_blurred" Node="N1_2_blurred_GE">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>
-                (A:ENG N1 RPM:2, percent) 5.0 &gt; if{ 1 } els{ 0 }
-            </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_3">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_N1_3_STILL</ANIM_NAME>
-			<ANIM_LENGTH>360</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_ENG_3_N1_ANG, degrees)</ANIM_CODE>
-			<ANIM_LAG>3600</ANIM_LAG>
-			<ANIM_WRAP>True</ANIM_WRAP>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_3_blurred" Node="N1_3_blurred_GE">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>
-                (A:ENG N1 RPM:3, percent) 5.0 &gt; if{ 1 } els{ 0 }
-            </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-
-	<Component ID="ADG_SPIN">
-        <UseTemplate Name="ASOBO_GT_Anim_Code">
-            <ANIM_NAME>MD11_EXT_ADG_SPIN</ANIM_NAME>
-            <ANIM_LENGTH>100</ANIM_LENGTH>
-            <ANIM_CODE>(L:MD11_ENG_ADG_ANG) 3.6 /</ANIM_CODE>
-            <ANIM_LAG>0</ANIM_LAG>
-            <ANIM_WRAP>True</ANIM_WRAP>
-        </UseTemplate>
-    </Component>
-	
-	<Component ID="FX_CONTRAIL_QUAD">
-		<UseTemplate Name="ASOBO_CONTRAIL_QUAD_FX">
-			<FX_NAME>FX_CONTRAIL_QUAD_LEFT</FX_NAME>
-			<FX_NODE>L1_EngineFX</FX_NODE>
-			<FX_ENGINE_ID>1</FX_ENGINE_ID>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_CONTRAIL_QUAD_FX">
-			<FX_NAME>FX_CONTRAIL_QUAD_CENTER</FX_NAME>
-			<FX_NODE>C1_EngineFX</FX_NODE>
-			<FX_ENGINE_ID>2</FX_ENGINE_ID>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_CONTRAIL_QUAD_FX">
-			<FX_NAME>FX_CONTRAIL_QUAD_RIGHT</FX_NAME>
-			<FX_NODE>R1_EngineFX</FX_NODE>
-			<FX_ENGINE_ID>3</FX_ENGINE_ID>
-		</UseTemplate>
-	</Component>
-	<Component ID="FX_CONTRAIL_RIBBON">
-		<UseTemplate Name="ASOBO_CONTRAIL_RIBBON_FX">
-			<FX_NAME>FX_CONTRAIL_RIBBON_LEFT</FX_NAME>
-			<FX_NODE>L1_EngineFX</FX_NODE>
-			<FX_CODE>(A:CONTRAILS CONDITIONS MET:1, Bool) (A:GENERAL ENG COMBUSTION:1, Bool) and (A:CONTRAILS CONDITIONS MET:2, Bool) (A:GENERAL ENG COMBUSTION:2, Bool) and or</FX_CODE>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_CONTRAIL_RIBBON_FX">
-			<FX_NAME>FX_CONTRAIL_RIBBON_RIGHT</FX_NAME>
-			<FX_NODE>R1_EngineFX</FX_NODE>
-			<FX_CODE>(A:CONTRAILS CONDITIONS MET:3, Bool) (A:GENERAL ENG COMBUSTION:3, Bool) and (A:CONTRAILS CONDITIONS MET:4, Bool) (A:GENERAL ENG COMBUSTION:4, Bool) and or</FX_CODE>
-		</UseTemplate>
-	</Component>
-	<Component ID="GEARS">
-		<UseTemplate Name="ASOBO_GEAR_Center_Tire_Template">
-			<ANIM_NAME>c_tire_key</ANIM_NAME>
-			<NODE_ID_STILL>c_tire_still</NODE_ID_STILL>
-			<NODE_ID_BLURRED>c_tire_still001</NODE_ID_BLURRED>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GEAR_Center_Tire_Template">
-			<ANIM_NAME>b_tire_key</ANIM_NAME>
-			<NODE_ID_STILL>aux_tire_still</NODE_ID_STILL>
-			<NODE_ID_BLURRED>aux_tire_still001</NODE_ID_BLURRED>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GEAR_Left_Tire_Template">
-			<ANIM_NAME>l_tire_key</ANIM_NAME>
-			<NODE_ID_STILL>l_mlg_tire_still_L1</NODE_ID_STILL>
-			<NODE_ID_STILL_2>l_mlg_tire_still_L2</NODE_ID_STILL_2>
-			<NODE_ID_STILL_3>L_mlg_tire_still_R1</NODE_ID_STILL_3>
-			<NODE_ID_STILL_4>l_mlg_tire_still_R2</NODE_ID_STILL_4>
-			<NODE_ID_BLURRED>l_mlg_tire_still_L003</NODE_ID_BLURRED>
-			<NODE_ID_BLURRED_2>l_mlg_tire_still_L004</NODE_ID_BLURRED_2>
-			<NODE_ID_BLURRED_3>L_mlg_tire_still_r003</NODE_ID_BLURRED_3>
-			<NODE_ID_BLURRED_4>L_mlg_tire_still_r004</NODE_ID_BLURRED_4>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GEAR_Right_Tire_Template">
-			<ANIM_NAME>r_tire_key</ANIM_NAME>
-			<NODE_ID_STILL>r_mlg_tire_still_L1</NODE_ID_STILL>
-			<NODE_ID_STILL_2>r_mlg_tire_still_L2</NODE_ID_STILL_2>
-			<NODE_ID_STILL_3>r_mlg_tire_still_R1</NODE_ID_STILL_3>
-			<NODE_ID_STILL_4>r_mlg_tire_still_R2</NODE_ID_STILL_4>
-			<NODE_ID_BLURRED>r_mlg_tire_still_L004</NODE_ID_BLURRED>
-			<NODE_ID_BLURRED_2>r_mlg_tire_still_L003</NODE_ID_BLURRED_2>
-			<NODE_ID_BLURRED_3>r_mlg_tire_still_R003</NODE_ID_BLURRED_3>
-			<NODE_ID_BLURRED_4>r_mlg_tire_still_R004</NODE_ID_BLURRED_4>
-		</UseTemplate>
-	</Component>
-	<Component ID="MD11_Gear_Compression">
-		<UseTemplate Name="MD11_Animation">
-      <NODE_ID>nlg_comp_strut</NODE_ID>
-      <ANIM_NAME>c_gear</ANIM_NAME>
-      <ANIM_CODE>(A:GEAR ANIMATION POSITION:0, percent) 2 *</ANIM_CODE>
-      <ANIM_LENGTH>200</ANIM_LENGTH>
-      <ANIM_LAG>0</ANIM_LAG>
-    </UseTemplate>
-    <UseTemplate Name="MD11_Animation">
-      <NODE_ID>l_mlg_comp_strut</NODE_ID>
-      <ANIM_NAME>l_gear</ANIM_NAME>
-      <ANIM_CODE>(A:GEAR ANIMATION POSITION:1, percent) 2 *</ANIM_CODE>
-      <ANIM_LENGTH>200</ANIM_LENGTH>
-      <ANIM_LAG>0</ANIM_LAG>
-    </UseTemplate>
-    <UseTemplate Name="MD11_Animation">
-      <NODE_ID>r_mlg_comp_strut</NODE_ID>
-      <ANIM_NAME>r_gear</ANIM_NAME>
-      <ANIM_CODE>(A:GEAR ANIMATION POSITION:2, percent) 2 *</ANIM_CODE>
-      <ANIM_LENGTH>200</ANIM_LENGTH>
-      <ANIM_LAG>0</ANIM_LAG>
-    </UseTemplate>
-    <UseTemplate Name="MD11_Animation">
-      <NODE_ID>clg_comp_strut</NODE_ID>
-      <ANIM_NAME>aux_gear</ANIM_NAME>
-      <ANIM_CODE>(A:GEAR ANIMATION POSITION:3, percent) 2 *</ANIM_CODE>
-      <ANIM_LENGTH>200</ANIM_LENGTH>
-      <ANIM_LAG>0</ANIM_LAG>
-    </UseTemplate>
-	</Component>
-	<!-- NOTE: 106FIX - Added NWS -->
-	<Component id="MD11_NWS">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_CODE>
-				(A:GEAR CENTER STEER ANGLE, grads) 0 &gt;
-				if{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * }
-				els{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * 200 + }
-			</ANIM_CODE>
-			<ANIM_LENGTH>200</ANIM_LENGTH>
-			<ANIM_NAME>c_wheel</ANIM_NAME>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	<!-- NOTE: 106FIX - Added Flex -->
-	<Component ID="MD11_WING_FLEX">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>l_wing_flex</ANIM_NAME>
-			<ANIM_CODE>(A:WING FLEX PCT:1, percent) 0.5 * 50 +</ANIM_CODE>
-			<ANIM_LENGTH>100</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>r_wing_flex</ANIM_NAME>
-			<ANIM_CODE>(A:WING FLEX PCT:2, percent) 0.5 * 50 +</ANIM_CODE>
-			<ANIM_LENGTH>100</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	<Component ID="MD11_TRUCK_TILT">
-  <UseTemplate Name="ASOBO_GT_Anim_Code">
-    <ANIM_CODE>(A:CONTACT POINT IS ON GROUND:1, number) (A:PLANE PITCH DEGREES, degrees) * -10 * </ANIM_CODE>
-    <ANIM_LENGTH>100</ANIM_LENGTH>
-    <ANIM_NAME>MD11_EXT_MLG_LEFT_TRUCK_TILT</ANIM_NAME>
-    <ANIM_LAG>300</ANIM_LAG>
-  </UseTemplate>
-  <UseTemplate Name="ASOBO_GT_Anim_Code">
-    <ANIM_CODE>(A:CONTACT POINT IS ON GROUND:2, number) (A:PLANE PITCH DEGREES, degrees) * -10 * </ANIM_CODE>
-    <ANIM_LENGTH>100</ANIM_LENGTH>
-    <ANIM_NAME>MD11_EXT_MLG_RIGHT_TRUCK_TILT</ANIM_NAME>
-    <ANIM_LAG>300</ANIM_LAG>
-  </UseTemplate>
-</Component>
-
-</Behaviors>
-</ModelInfo>
\ No newline at end of file
diff --git a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_PW/model/TFDi_MD11_F_EXT.xml b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_PW/model/TFDi_MD11_F_EXT.xml
index 608045e..ece940e 100644
--- a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_PW/model/TFDi_MD11_F_EXT.xml
+++ b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_PW/model/TFDi_MD11_F_EXT.xml
@@ -2,8 +2,8 @@
 
 <ModelInfo>
 	<LODS>
-		<LOD minSize="150" ModelFile="..\..\TFDi_Design_MD-11F_GE\model\TFDi_MD11_F_EXT_LOD0.gltf">
-		<MergeModel>..\..\TFDi_Design_MD-11F_GE\model\TFDi_MD11_ENG_PW_LOD0.gltf</MergeModel>
+		<LOD minSize="150" ModelFile="..\..\TFDi_Design_MD-11\model\TFDi_MD11_F_EXT_LOD0.gltf">
+		<MergeModel>..\..\TFDi_Design_MD-11\model\TFDi_MD11_ENG_PW_LOD0.gltf</MergeModel>
 		</LOD>
 	</LODS>
 
@@ -149,16 +149,6 @@
             </VISIBILITY_CODE>
 		</UseTemplate>
 	</Component>
-
-	<Component ID="ADG_SPIN">
-        <UseTemplate Name="ASOBO_GT_Anim_Code">
-            <ANIM_NAME>MD11_EXT_ADG_SPIN</ANIM_NAME>
-            <ANIM_LENGTH>100</ANIM_LENGTH>
-            <ANIM_CODE>(L:MD11_ENG_ADG_ANG) 3.6 /</ANIM_CODE>
-            <ANIM_LAG>0</ANIM_LAG>
-            <ANIM_WRAP>True</ANIM_WRAP>
-        </UseTemplate>
-    </Component>
 	
 	<Component ID="FX_CONTRAIL_QUAD">
 		<UseTemplate Name="ASOBO_CONTRAIL_QUAD_FX">
@@ -253,34 +243,6 @@
       <ANIM_LAG>0</ANIM_LAG>
     </UseTemplate>
 	</Component>
-	<!-- NOTE: 106FIX - Added NWS -->
-	<Component id="MD11_NWS">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_CODE>
-				(A:GEAR CENTER STEER ANGLE, grads) 0 &gt;
-				if{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * }
-				els{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * 200 + }
-			</ANIM_CODE>
-			<ANIM_LENGTH>200</ANIM_LENGTH>
-			<ANIM_NAME>c_wheel</ANIM_NAME>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	<!-- NOTE: 106FIX - Added Flex -->
-	<Component ID="MD11_WING_FLEX">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>l_wing_flex</ANIM_NAME>
-			<ANIM_CODE>(A:WING FLEX PCT:1, percent) 0.5 * 50 +</ANIM_CODE>
-			<ANIM_LENGTH>100</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>r_wing_flex</ANIM_NAME>
-			<ANIM_CODE>(A:WING FLEX PCT:2, percent) 0.5 * 50 +</ANIM_CODE>
-			<ANIM_LENGTH>100</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
 	<Component ID="MD11_TRUCK_TILT">
   <UseTemplate Name="ASOBO_GT_Anim_Code">
     <ANIM_CODE>(A:CONTACT POINT IS ON GROUND:1, number) (A:PLANE PITCH DEGREES, degrees) * -10 * </ANIM_CODE>
diff --git a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_GE/model/TFDi_MD11_PAX_EXT.xml b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_GE/model/TFDi_MD11_PAX_EXT.xml
deleted file mode 100644
index a1234e4..0000000
--- a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_GE/model/TFDi_MD11_PAX_EXT.xml
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ModelInfo>
-	<LODS>
-		<LOD minSize="150" ModelFile="TFDi_MD11_PAX_EXT_LOD0.gltf">
-		<MergeModel>TFDi_MD11_ENG_GE_LOD0.gltf</MergeModel>
-		</LOD>
-	</LODS>
-	
-<Behaviors>
-<Include ModelBehaviorFile="Asobo\Exterior.xml"/>
-<Include ModelBehaviorFile="Asobo\Common.xml"/>
-<Include ModelBehaviorFile="Asobo\Generic\FX.xml"/>
-<Include ModelBehaviorFile="TFDi_Design\MD11\Templates\FlightDeck.xml"/>
-<Include ModelBehaviorFile="TFDi_Design\MD11\MD11_Exterior.xml"/>
-<Component ID="TFDi_MD11_Exterior_Core">
-<UseTemplate Name="Invernyx_MD11_Exterior"/>
-</Component>
-<!-- Begin Templates -->
-
-<!-- <Template Name="MD11_N1_Slow">
-	<DefaultTemplateParameters>
-		<NODE_ID/>
-		<VAR_NAME/>
-		<MAX_N1>5.0</MAX_N1>
-	</DefaultTemplateParameters>
-
-	<Component ID="MD11_ENG_N1_#NODE_ID#" Node="#NODE_ID#">
-		<UseTemplate Name="ASOBO_GT_Part_ID"/>
-		<Material>
-			<EmissiveFactor>
-				<Parameter>
-					<Code>(L:#VAR_NAME#, enum) 0.1 * #INTENSITY# * </Code>
-				</Parameter>
-				<OverrideBaseEmissive>True</OverrideBaseEmissive>
-			</EmissiveFactor>
-		</Material>
-	</Component>
-</Template> -->
-
-<Template Name="MD11_N1_Template">
-		<DefaultTemplateParameters>
-			<ANIM_NAME/>
-			<ANIM_LENGTH>360</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-			<ANIM_WRAP>True</ANIM_WRAP>
-			<ANIM_DELTA>True</ANIM_DELTA>
-			<NODE_ID_STILL/>
-			<NODE_ID_BLURRED/>
-			<VAR_NAME>#VAR_NAME#</VAR_NAME>
-			<MAX_RPM/>
-		</DefaultTemplateParameters>
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_CODE>(L:#VAR_NAME#, degrees)</ANIM_CODE>
-			<ANIM_NAME>#ANIM_NAME#</ANIM_NAME>
-			<ANIM_LENGTH>#ANIM_LENGTH#</ANIM_LENGTH>
-			<ANIM_LAG>#ANIM_LAG#</ANIM_LAG>
-			<ANIM_WRAP>#ANIM_WRAP#</ANIM_WRAP>
-			<ANIM_DELTA>#ANIM_DELTA#</ANIM_DELTA>
-		</UseTemplate>
-		<Component ID="MD11_#NODE_ID_STILL#" Node="#NODE_ID_STILL#">
-			<UseTemplate Name="ASOBO_GT_Visibility_Code">
-				<VISIBILITY_CODE>(A:ENGINE N1 RPM:1, percent) 10 &lt; if{ 1 } els{ 0 } </VISIBILITY_CODE>
-			</UseTemplate>
-		</Component>
-	</Template>
-
-<!-- End Templates -->
-	
-	<Component ID="Pilot_Visibility" Node="PILOT_0">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>(A:CAMERA STATE, enum) 2 == ; if{ 0 } els{ 1 } </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Copilot_Visibility" Node="PILOT_1">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>(A:CAMERA STATE, enum) 2 == ; if{ 0 } els{ 1 } </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="ADG_Deploy">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_ADG_DEPLOY</ANIM_NAME>
-			<ANIM_LENGTH>50</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_PED_ADG_LVR, enum) 50 * </ANIM_CODE>
-			<ANIM_LAG>50</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="GPU_Door">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_GPU_DOOR</ANIM_NAME>
-			<ANIM_LENGTH>10</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_EXT_GPU, bool) 10 * </ANIM_CODE>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_1">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_N1_1_STILL</ANIM_NAME>
-			<ANIM_LENGTH>360</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_ENG_1_N1_ANG, degrees)</ANIM_CODE>
-			<ANIM_LAG>3600</ANIM_LAG>
-			<ANIM_WRAP>True</ANIM_WRAP>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_1_blurred" Node="N1_1_blurred_GE">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>
-                (A:ENG N1 RPM:1, percent) 5.0 &gt; if{ 1 } els{ 0 }
-            </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-		
-	<Component ID="Engine_Fans_2">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_N1_2_STILL</ANIM_NAME>
-			<ANIM_LENGTH>360</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_ENG_2_N1_ANG, degrees)</ANIM_CODE>
-			<ANIM_LAG>3600</ANIM_LAG>
-			<ANIM_WRAP>True</ANIM_WRAP>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_2_blurred" Node="N1_2_blurred_GE">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>
-                (A:ENG N1 RPM:2, percent) 5.0 &gt; if{ 1 } els{ 0 }
-            </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_3">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>MD11_EXT_N1_3_STILL</ANIM_NAME>
-			<ANIM_LENGTH>360</ANIM_LENGTH>
-			<ANIM_CODE>(L:MD11_ENG_3_N1_ANG, degrees)</ANIM_CODE>
-			<ANIM_LAG>3600</ANIM_LAG>
-			<ANIM_WRAP>True</ANIM_WRAP>
-		</UseTemplate>
-	</Component>
-	
-	<Component ID="Engine_Fans_3_blurred" Node="N1_3_blurred_GE">
-		<UseTemplate Name="ASOBO_GT_Visibility_Code">
-			<VISIBILITY_CODE>
-                (A:ENG N1 RPM:3, percent) 5.0 &gt; if{ 1 } els{ 0 }
-            </VISIBILITY_CODE>
-		</UseTemplate>
-	</Component>
-
-	<Component ID="ADG_SPIN">
-        <UseTemplate Name="ASOBO_GT_Anim_Code">
-            <ANIM_NAME>MD11_EXT_ADG_SPIN</ANIM_NAME>
-            <ANIM_LENGTH>100</ANIM_LENGTH>
-            <ANIM_CODE>(L:MD11_ENG_ADG_ANG) 3.6 /</ANIM_CODE>
-            <ANIM_LAG>0</ANIM_LAG>
-            <ANIM_WRAP>True</ANIM_WRAP>
-        </UseTemplate>
-    </Component>
-	
-	<Component ID="FX_CONTRAIL_QUAD">
-		<UseTemplate Name="ASOBO_CONTRAIL_QUAD_FX">
-			<FX_NAME>FX_CONTRAIL_QUAD_LEFT</FX_NAME>
-			<FX_NODE>L1_EngineFX</FX_NODE>
-			<FX_ENGINE_ID>1</FX_ENGINE_ID>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_CONTRAIL_QUAD_FX">
-			<FX_NAME>FX_CONTRAIL_QUAD_CENTER</FX_NAME>
-			<FX_NODE>C1_EngineFX</FX_NODE>
-			<FX_ENGINE_ID>2</FX_ENGINE_ID>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_CONTRAIL_QUAD_FX">
-			<FX_NAME>FX_CONTRAIL_QUAD_RIGHT</FX_NAME>
-			<FX_NODE>R1_EngineFX</FX_NODE>
-			<FX_ENGINE_ID>3</FX_ENGINE_ID>
-		</UseTemplate>
-	</Component>
-	<Component ID="FX_CONTRAIL_RIBBON">
-		<UseTemplate Name="ASOBO_CONTRAIL_RIBBON_FX">
-			<FX_NAME>FX_CONTRAIL_RIBBON_LEFT</FX_NAME>
-			<FX_NODE>L1_EngineFX</FX_NODE>
-			<FX_CODE>(A:CONTRAILS CONDITIONS MET:1, Bool) (A:GENERAL ENG COMBUSTION:1, Bool) and (A:CONTRAILS CONDITIONS MET:2, Bool) (A:GENERAL ENG COMBUSTION:2, Bool) and or</FX_CODE>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_CONTRAIL_RIBBON_FX">
-			<FX_NAME>FX_CONTRAIL_RIBBON_RIGHT</FX_NAME>
-			<FX_NODE>R1_EngineFX</FX_NODE>
-			<FX_CODE>(A:CONTRAILS CONDITIONS MET:3, Bool) (A:GENERAL ENG COMBUSTION:3, Bool) and (A:CONTRAILS CONDITIONS MET:4, Bool) (A:GENERAL ENG COMBUSTION:4, Bool) and or</FX_CODE>
-		</UseTemplate>
-	</Component>
-	<Component ID="GEARS">
-		<UseTemplate Name="ASOBO_GEAR_Center_Tire_Template">
-			<ANIM_NAME>c_tire_key</ANIM_NAME>
-			<NODE_ID_STILL>c_tire_still</NODE_ID_STILL>
-			<NODE_ID_BLURRED>c_tire_still001</NODE_ID_BLURRED>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GEAR_Center_Tire_Template">
-			<ANIM_NAME>b_tire_key</ANIM_NAME>
-			<NODE_ID_STILL>aux_tire_still</NODE_ID_STILL>
-			<NODE_ID_BLURRED>aux_tire_still001</NODE_ID_BLURRED>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GEAR_Left_Tire_Template">
-			<ANIM_NAME>l_tire_key</ANIM_NAME>
-			<NODE_ID_STILL>l_mlg_tire_still_L1</NODE_ID_STILL>
-			<NODE_ID_STILL_2>l_mlg_tire_still_L2</NODE_ID_STILL_2>
-			<NODE_ID_STILL_3>L_mlg_tire_still_R1</NODE_ID_STILL_3>
-			<NODE_ID_STILL_4>l_mlg_tire_still_R2</NODE_ID_STILL_4>
-			<NODE_ID_BLURRED>l_mlg_tire_still_L003</NODE_ID_BLURRED>
-			<NODE_ID_BLURRED_2>l_mlg_tire_still_L004</NODE_ID_BLURRED_2>
-			<NODE_ID_BLURRED_3>L_mlg_tire_still_r003</NODE_ID_BLURRED_3>
-			<NODE_ID_BLURRED_4>L_mlg_tire_still_r004</NODE_ID_BLURRED_4>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GEAR_Right_Tire_Template">
-			<ANIM_NAME>r_tire_key</ANIM_NAME>
-			<NODE_ID_STILL>r_mlg_tire_still_L1</NODE_ID_STILL>
-			<NODE_ID_STILL_2>r_mlg_tire_still_L2</NODE_ID_STILL_2>
-			<NODE_ID_STILL_3>r_mlg_tire_still_R1</NODE_ID_STILL_3>
-			<NODE_ID_STILL_4>r_mlg_tire_still_R2</NODE_ID_STILL_4>
-			<NODE_ID_BLURRED>r_mlg_tire_still_L004</NODE_ID_BLURRED>
-			<NODE_ID_BLURRED_2>r_mlg_tire_still_L003</NODE_ID_BLURRED_2>
-			<NODE_ID_BLURRED_3>r_mlg_tire_still_R003</NODE_ID_BLURRED_3>
-			<NODE_ID_BLURRED_4>r_mlg_tire_still_R004</NODE_ID_BLURRED_4>
-		</UseTemplate>
-	</Component>
-	<!-- NOTE: 106FIX - Added Compression -->
-	<Component ID="MD11_Gear_Compression">
-		<UseTemplate Name="MD11_Animation">
-			<NODE_ID>nlg_comp_strut</NODE_ID>
-			<ANIM_NAME>c_gear</ANIM_NAME>
-			<ANIM_CODE>(A:GEAR ANIMATION POSITION:0, percent) 2 *</ANIM_CODE>
-			<ANIM_LENGTH>200</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-		<UseTemplate Name="MD11_Animation">
-			<NODE_ID>l_mlg_comp_strut</NODE_ID>
-			<ANIM_NAME>l_gear</ANIM_NAME>
-			<ANIM_CODE>(A:GEAR ANIMATION POSITION:1, percent) 2 *</ANIM_CODE>
-			<ANIM_LENGTH>200</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-		<UseTemplate Name="MD11_Animation">
-			<NODE_ID>r_mlg_comp_strut</NODE_ID>
-			<ANIM_NAME>r_gear</ANIM_NAME>
-			<ANIM_CODE>(A:GEAR ANIMATION POSITION:2, percent) 2 *</ANIM_CODE>
-			<ANIM_LENGTH>200</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-		<UseTemplate Name="MD11_Animation">
-			<NODE_ID>clg_comp_strut</NODE_ID>
-			<ANIM_NAME>aux_gear</ANIM_NAME>
-			<ANIM_CODE>(A:GEAR ANIMATION POSITION:3, percent) 2 *</ANIM_CODE>
-			<ANIM_LENGTH>200</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	<!-- NOTE: 106FIX - Added NWS -->
-	<Component id="MD11_NWS">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_CODE>
-				(A:GEAR CENTER STEER ANGLE, grads) 0 &gt;
-				if{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * }
-				els{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * 200 + }
-			</ANIM_CODE>
-			<ANIM_LENGTH>200</ANIM_LENGTH>
-			<ANIM_NAME>c_wheel</ANIM_NAME>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	<!-- NOTE: 106FIX - Added Flex -->
-	<Component ID="MD11_WING_FLEX">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>l_wing_flex</ANIM_NAME>
-			<ANIM_CODE>(A:WING FLEX PCT:1, percent) 0.5 * 50 +</ANIM_CODE>
-			<ANIM_LENGTH>100</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>r_wing_flex</ANIM_NAME>
-			<ANIM_CODE>(A:WING FLEX PCT:2, percent) 0.5 * 50 +</ANIM_CODE>
-			<ANIM_LENGTH>100</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	<Component ID="MD11_TRUCK_TILT">
-  <UseTemplate Name="ASOBO_GT_Anim_Code">
-    <ANIM_CODE>(A:CONTACT POINT IS ON GROUND:1, number) (A:PLANE PITCH DEGREES, degrees) * -10 * </ANIM_CODE>
-    <ANIM_LENGTH>100</ANIM_LENGTH>
-    <ANIM_NAME>MD11_EXT_MLG_LEFT_TRUCK_TILT</ANIM_NAME>
-    <ANIM_LAG>300</ANIM_LAG>
-  </UseTemplate>
-  <UseTemplate Name="ASOBO_GT_Anim_Code">
-    <ANIM_CODE>(A:CONTACT POINT IS ON GROUND:2, number) (A:PLANE PITCH DEGREES, degrees) * -10 * </ANIM_CODE>
-    <ANIM_LENGTH>100</ANIM_LENGTH>
-    <ANIM_NAME>MD11_EXT_MLG_RIGHT_TRUCK_TILT</ANIM_NAME>
-    <ANIM_LAG>300</ANIM_LAG>
-  </UseTemplate>
-</Component>
-
-</Behaviors>
-</ModelInfo>
\ No newline at end of file
diff --git a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_PW/model/TFDi_MD11_PAX_EXT.xml b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_PW/model/TFDi_MD11_PAX_EXT.xml
index c8c4565..68a2ec7 100644
--- a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_PW/model/TFDi_MD11_PAX_EXT.xml
+++ b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_PW/model/TFDi_MD11_PAX_EXT.xml
@@ -2,8 +2,8 @@
 
 <ModelInfo>
 	<LODS>
-		<LOD minSize="150" ModelFile="..\..\TFDi_Design_MD-11_GE\model\TFDi_MD11_PAX_EXT_LOD0.gltf">
-			<MergeModel>..\..\TFDi_Design_MD-11_GE\model\TFDi_MD11_ENG_PW_LOD0.gltf</MergeModel>
+		<LOD minSize="150" ModelFile="..\..\TFDi_Design_MD-11\model\TFDi_MD11_PAX_EXT_LOD0.gltf">
+			<MergeModel>..\..\TFDi_Design_MD-11\model\TFDi_MD11_ENG_PW_LOD0.gltf</MergeModel>
 		</LOD>
 	</LODS>
 	
@@ -149,16 +149,6 @@
             </VISIBILITY_CODE>
 		</UseTemplate>
 	</Component>
-
-	<Component ID="ADG_SPIN">
-        <UseTemplate Name="ASOBO_GT_Anim_Code">
-            <ANIM_NAME>MD11_EXT_ADG_SPIN</ANIM_NAME>
-            <ANIM_LENGTH>100</ANIM_LENGTH>
-            <ANIM_CODE>(L:MD11_ENG_ADG_ANG) 3.6 /</ANIM_CODE>
-            <ANIM_LAG>0</ANIM_LAG>
-            <ANIM_WRAP>True</ANIM_WRAP>
-        </UseTemplate>
-    </Component>
 	
 	<Component ID="FX_CONTRAIL_QUAD">
 		<UseTemplate Name="ASOBO_CONTRAIL_QUAD_FX">
@@ -253,34 +243,6 @@
       <ANIM_LAG>0</ANIM_LAG>
     </UseTemplate>
 	</Component>
-	<!-- NOTE: 106FIX - Added NWS -->
-	<Component id="MD11_NWS">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_CODE>
-				(A:GEAR CENTER STEER ANGLE, grads) 0 &gt;
-				if{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * }
-				els{ (A:GEAR CENTER STEER ANGLE, grads) 0.5 * 200 + }
-			</ANIM_CODE>
-			<ANIM_LENGTH>200</ANIM_LENGTH>
-			<ANIM_NAME>c_wheel</ANIM_NAME>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
-	<!-- NOTE: 106FIX - Added Flex -->
-	<Component ID="MD11_WING_FLEX">
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>l_wing_flex</ANIM_NAME>
-			<ANIM_CODE>(A:WING FLEX PCT:1, percent) 0.5 * 50 +</ANIM_CODE>
-			<ANIM_LENGTH>100</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-		<UseTemplate Name="ASOBO_GT_Anim_Code">
-			<ANIM_NAME>r_wing_flex</ANIM_NAME>
-			<ANIM_CODE>(A:WING FLEX PCT:2, percent) 0.5 * 50 +</ANIM_CODE>
-			<ANIM_LENGTH>100</ANIM_LENGTH>
-			<ANIM_LAG>0</ANIM_LAG>
-		</UseTemplate>
-	</Component>
 	<Component ID="MD11_TRUCK_TILT">
   <UseTemplate Name="ASOBO_GT_Anim_Code">
     <ANIM_CODE>(A:CONTACT POINT IS ON GROUND:1, number) (A:PLANE PITCH DEGREES, degrees) * -10 * </ANIM_CODE>