diff --git a/PackageDefinitions/xkhofmann-md-11.xml b/PackageDefinitions/xkhofmann-md-11.xml
index a76fbdb..3a2b69e 100644
--- a/PackageDefinitions/xkhofmann-md-11.xml
+++ b/PackageDefinitions/xkhofmann-md-11.xml
@@ -3,7 +3,7 @@
 	<ItemSettings>
 		<ContentType>MISC</ContentType>
 		<Title>md-11</Title>
-		<Manufacturer />
+		<Manufacturer/>
 		<Creator>khofmann</Creator>
 	</ItemSettings>
 	<Flags>
@@ -36,4 +36,5 @@
 			<OutputDir>ModelBehaviorDefs\</OutputDir>
 		</AssetGroup>
 	</AssetGroups>
-</AssetPackage>
\ No newline at end of file
+</AssetPackage>
+
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Templates.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Templates.xml
index d20c1aa..60c75c7 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Templates.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Templates.xml
@@ -21,17 +21,21 @@
 
   <Template Name="MD11_Annunciator_Template">
     <DefaultTemplateParameters>
-      <NODE_ID />
       <VAR_NAME>MD11_LTS_BRT_DIM</VAR_NAME>
       <INTENSITY>1.8</INTENSITY>
     </DefaultTemplateParameters>
 
     <Component ID="MD11_Annunciator_#NODE_ID#" Node="#NODE_ID#">
       <UseTemplate Name="ASOBO_GT_Part_ID" />
+      <Visibility>
+        <Parameter>
+          <Code>(L:#NODE_ID#, bool)</Code>
+        </Parameter>
+      </Visibility>
       <Material>
         <EmissiveFactor>
           <Parameter>
-            <Code>(L:#VAR_NAME#, percent over 100) 2.7 pow #INTENSITY# * </Code>
+            <Code>(L:#VAR_NAME#, percent over 100) 2.7 pow #INTENSITY#</Code>
           </Parameter>
           <OverrideBaseEmissive>True</OverrideBaseEmissive>
         </EmissiveFactor>
@@ -53,7 +57,7 @@
       <Material>
         <EmissiveFactor>
           <Parameter>
-            <Code>(A:#VAR_NAME#:#INDEX#, #UNITS#) 1.3 pow 0.1 * #INTENSITY# * </Code>
+            <Code>(A:#VAR_NAME#:#INDEX#, #UNITS#) 1.3 pow 0.1 * #INTENSITY# *</Code>
           </Parameter>
           <OverrideBaseEmissive>True</OverrideBaseEmissive>
         </EmissiveFactor>
diff --git a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model.F/TFDi_MD11_INT.xml b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model.F/TFDi_MD11_INT.xml
index d8cbf0c..2053e08 100644
--- a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model.F/TFDi_MD11_INT.xml
+++ b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model.F/TFDi_MD11_INT.xml
@@ -9,8 +9,6 @@
 
 		<!-- KHOFMANN START -->
 		<Include ModelBehaviorFile="TFDi_Design_MD-11\TFDi_MD11_INT_Templates.xml" />
-
-		<!-- FIXME: MERGER NTO THIS FILE ONCE DONE -->
 		<Include RelativeFile="..\..\TFDi_Design_MD-11_Shared\TFDi_MD11_INT_OG.xml" />
 		<Include RelativeFile="..\..\TFDi_Design_MD-11_Shared\TFDi_MD11_INT_OVHD.xml" />
 		<Include RelativeFile="..\..\TFDi_Design_MD-11_Shared\TFDi_MD11_INT_AOVHD.xml" />
@@ -36,10 +34,7 @@
 		<Component ID="TFDi_MD11_INT_OG">
 			<UseTemplate Name="TFDi_MD11_INT_OG" />
 		</Component>
-
 		<!-- KHOFMANN END-->
-
-
 	</Behaviors>
 
 	<Animation name="MD11_CAB_LIGHTS_SRC" guid="ad3d7f6d-8f24-4dde-af5e-4c158a5d91e6" type="Sim"
@@ -17985,42 +17980,6 @@
 			</Parameter>
 		</Visibility>
 	</PartInfo>
-	<PartInfo>
-		<Name>MD11_OVHD_ENG_IGN_OFF_LT</Name>
-		<AnimLength>50</AnimLength>
-		<Visibility>
-			<Parameter>
-				<Code>(L:MD11_OVHD_ENG_IGN_OFF_LT, bool)</Code>
-			</Parameter>
-		</Visibility>
-	</PartInfo>
-	<PartInfo>
-		<Name>MD11_OVHD_ENG_A_LT</Name>
-		<AnimLength>50</AnimLength>
-		<Visibility>
-			<Parameter>
-				<Code>(L:MD11_OVHD_ENG_A_LT, bool)</Code>
-			</Parameter>
-		</Visibility>
-	</PartInfo>
-	<PartInfo>
-		<Name>MD11_OVHD_ENG_B_LT</Name>
-		<AnimLength>50</AnimLength>
-		<Visibility>
-			<Parameter>
-				<Code>(L:MD11_OVHD_ENG_B_LT, bool)</Code>
-			</Parameter>
-		</Visibility>
-	</PartInfo>
-	<PartInfo>
-		<Name>MD11_OVHD_ENG_IGN_OVRD_LT</Name>
-		<AnimLength>50</AnimLength>
-		<Visibility>
-			<Parameter>
-				<Code>(L:MD11_OVHD_ENG_IGN_OVRD_LT, bool)</Code>
-			</Parameter>
-		</Visibility>
-	</PartInfo>
 	<PartInfo>
 		<Name>MD11_OVHD_CRG_DOOR_TEST_LT</Name>
 		<AnimLength>50</AnimLength>
diff --git a/TODO.MD b/TODO.MD
new file mode 100644
index 0000000..64f0524
--- /dev/null
+++ b/TODO.MD
@@ -0,0 +1,2 @@
+# Continue with FUEL
+# Continue with AIR
\ No newline at end of file