diff --git a/xml/decoders/SoundTraxx_Eco_Diesel_OEM_Athearn.xml b/xml/decoders/SoundTraxx_Eco_Diesel_OEM_Athearn.xml
index 2eb383fdea3..a85805958d5 100644
--- a/xml/decoders/SoundTraxx_Eco_Diesel_OEM_Athearn.xml
+++ b/xml/decoders/SoundTraxx_Eco_Diesel_OEM_Athearn.xml
@@ -79,6 +79,12 @@
             <authorinitials>MM</authorinitials>
             <revremark>Move outputs to family level</revremark>
         </revision>
+        <revision>
+            <revnumber>8</revnumber>
+            <date>2019-09-04</date>
+            <authorinitials>MM</authorinitials>
+            <revremark>Add new SD40 models</revremark>
+        </revision>
     </revhistory>
     <!-- Decoder Model information follows -->
     <decoder>
@@ -97,7 +103,11 @@
             </model>
             <model model="ECO-RTR SD38 w/strobe 2" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="851" comment="Model E0101.002B">
             </model>
-            <model model="ECO-RTR SD40 w/gyra" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="863" comment="Model E????.???">
+            <model model="ECO-RTR SD40" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="862" comment="Model E0102.001">
+            </model>
+            <model model="ECO-RTR SD40 w/ditch" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="975" comment="Model E0102.011">
+            </model>
+            <model model="ECO-RTR SD40 w/gyra" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="863" comment="Model E0102.005">
             </model>
             <model model="ECO-RTR SD40-2 w/DB" numOuts="4" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="789" comment="Model E0102.002B">
             </model>
@@ -165,31 +175,44 @@
         <!-- Configuration Variable (CV) information follows -->
         <variables>
             <xi:include href="http://jmri.org/xml/decoders/soundtraxx/OEMAthearnCV.xml"/>
-            <xi:include href="http://jmri.org/xml/decoders/nmra/cv29direction.xml"/>
+            <variable item="Locomotive Direction" CV="29" mask="XXXXXXXV" default="0" >
+                <defaultItem default="1" include="975"/>
+                <xi:include href="http://jmri.org/xml/decoders/parts/enum-NormRev.xml"/>
+                <label>Locomotive Direction</label>
+                <label xml:lang="cs">Směr lokomotivy</label>
+                <label xml:lang="de">Fahrtrichtung Standard</label>
+                <label xml:lang="fr">Sens normal de marche</label>
+                <label xml:lang="it">Direzione Normale di Marcia</label>
+                <tooltip>Sets the relative direction of the loco when told to move forward</tooltip>
+                <tooltip xml:lang="cs">Nastaví relativní směr lokomotivy když je vydán příkaz pohyb vpřed.</tooltip>
+                <tooltip xml:lang="fr">Règle le sens relatif de mouvement de la loco lorsque la marche avant est commandée</tooltip>
+                <tooltip xml:lang="de">Legt die relative Fahrtrichtung der Lokomotive fest wenn Fahrbefehl "Vorwärts" erteilt wird.</tooltip>
+                <tooltip xml:lang="it">Stabilisce la direzione di marcia relativa quando la loco è in marcia avanti</tooltip>
+            </variable>
             <variable item="Headlight F0(f) Light Type" CV="49" mask="VXXXXXXX" default="0" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="863,864,"/>
+                <defaultItem default="1" include="862,863,864,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>Headlight F0(f) Light Type</label>
             </variable>
             <variable item="Backup Light F0(r) Light Type" CV="50" mask="VXXXXXXX" default="0"  tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="863,864"/>
+                <defaultItem default="1" include="862,863,864,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>Backup Light F0(r) Light Type</label>
             </variable>
             <variable item="FX5 Effect Selection" CV="51" mask="XXXVVVVV" default="0" minOut="3" tooltip="Determines the effect generated from the FX3 light output">
                 <defaultItem default="3" include="863,864"/>
                 <defaultItem default="5" include="780,789,846,851"/>
-                <defaultItem default="9" include="825"/>
+                <defaultItem default="9" include="825,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSU2enumEffect.xml"/>
                 <label>FX3 Effect Selection</label>
             </variable>
             <variable item="FX5 Grade Crossing Logic" CV="51" mask="XVXXXXXX" default="0" minOut="3" tooltip="Causes the lighting effect to become active only when the horn has been sounded">
-                <defaultItem default="1" include="825"/>
+                <defaultItem default="1" include="825,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>FX3 Grade Crossing Logic</label>
             </variable>
             <variable item="FX5 Light Type" CV="51" mask="VXXXXXXX" default="0" minOut="3" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="863,864"/>
+                <defaultItem default="1" include="862,863,864,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>FX3 Light Type</label>
             </variable>
@@ -197,22 +220,22 @@
                 <defaultItem default="3" include="846,863"/>
                 <defaultItem default="7" include="789"/>
                 <defaultItem default="8" include="864"/>
-                <defaultItem default="9" include="825"/>
+                <defaultItem default="9" include="825,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSU2enumEffect.xml"/>
                 <label>FX4 Effect Selection</label>
             </variable>
             <variable item="FX6 Phase Selection" CV="52" mask="XXVXXXXX" default="0" minOut="4" tooltip="Alters the timing of the effect so that it's 180 degrees out of phase with the other effects">
-                <defaultItem default="1" include="825"/>
+                <defaultItem default="1" include="825,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumPhase.xml"/>
                 <label>FX4 Phase Selection</label>
             </variable>
             <variable item="FX6 Grade Crossing Logic" CV="52" mask="XVXXXXXX" default="0" minOut="4" tooltip="Causes the lighting effect to become active only when the horn has been sounded">
-                <defaultItem default="1" include="825"/>
+                <defaultItem default="1" include="825,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>FX4 Grade Crossing Logic</label>
             </variable>
             <variable item="FX6 Light Type" CV="52" mask="VXXXXXXX" default="0" minOut="4" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="863,864"/>
+                <defaultItem default="1" include="862,863,864,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>FX4 Light Type</label>
             </variable>
@@ -225,11 +248,12 @@
                 <label>Backup Light F0(r) Forward Directional Control</label>
             </variable>
             <variable item="FX5 Forward Directional Control" CV="57" mask="XXXXXVXX" default="1" minOut="3" tooltip="Check to enable FX3 function output in Forward direction">
+                <defaultItem default="0" include="975"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>FX3 Forward Directional Control</label>
             </variable>
             <variable item="FX6 Forward Directional Control" CV="57" mask="XXXXVXXX" default="1" minOut="4" tooltip="Check to enable FX4 function output in Forward direction">
-                <defaultItem default="0" include="863"/>
+                <defaultItem default="0" include="862,863,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>FX4 Forward Directional Control</label>
             </variable>
@@ -242,7 +266,7 @@
                 <label>Backup Light F0(r) Reverse Directional Control</label>
             </variable>
             <variable item="FX5 Reverse Directional Control" CV="58" mask="XXXXXVXX" default="1" minOut="3" tooltip="Check to enable FX3 function output in Reverse direction">
-                <defaultItem default="0" include="781,825,863,864"/>
+                <defaultItem default="0" include="781,825,862,863,864"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>FX3 Reverse Directional Control</label>
             </variable>
@@ -252,7 +276,7 @@
                 <label>FX4 Reverse Directional Control</label>
             </variable>
             <variable item="Hyperlight Flash Rate (0-15)" CV="59" mask="XXXXVVVV" default="7" tooltip="Sets the overall flash rate of the Hyperlight effects, 0 is fast, 15 is slow">
-                <defaultItem default="5" include="789,863,864"/>
+                <defaultItem default="5" include="789,862,863,864,975"/>
                 <decVal max="15"/>
                 <label>Hyperlight Flash Rate (0-15)</label>
             </variable>
@@ -269,7 +293,7 @@
                 <label>Brightness 2 Level (0-255)</label>
             </variable>
             <variable CV="63" item="Dimmer" default="153" tooltip="Adjust the brightness level of the on/off dimmable headlight effect">
-                <defaultItem default="130" include="863,864"/>
+                <defaultItem default="130" include="862,863,864,975"/>
                 <decVal/>
                 <label>Dimmer Level (0-255)</label>
             </variable>
@@ -287,7 +311,7 @@
             <!-- Sound Selection follows -->
             <variable CV="120" mask="XXVVVVVV" item="Sound Option 6" default="12" tooltip="Selects which airhorn to use">
                 <defaultItem default="2" include="825"/>
-                <defaultItem default="6" include="863,864"/>
+                <defaultItem default="6" include="863,864,975"/>
                 <defaultItem default="7" include="851"/>
                 <defaultItem default="10" include="846"/>
                 <enumVal>
@@ -309,16 +333,16 @@
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumDieselBellAthearn.xml"/>
                 <label>Bell Select</label>
             </variable>
-            <variable CV="123" mask="XXXXVVVV" item="Sound Option 5" default="0" include="774,775,850,851,780,773,789,781,863,864">
-                <defaultItem default="0" include="774,775,850,851,780"/>
-                <defaultItem default="2" include="773,789,781,863,864"/>
+            <variable CV="123" mask="XXXXVVVV" item="Sound Option 5" default="2" exclude="825">
+                <defaultItem default="0" include="774,775,780,850,851"/>
+                <defaultItem default="2" include="773,781,789,862,863,864,975"/>
+                <defaultItem default="3" include="846"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumPrimeMover1Athearn.xml"/>
                 <label>Prime Mover Select</label>
                 <tooltip>Select one of prime mover sound effects</tooltip>
             </variable>
-            <variable CV="123" mask="XXXXVVVV" item="Sound Option 5" default="0" include="825,846">
+            <variable CV="123" mask="XXXXVVVV" item="Sound Option 5" default="0" include="825">
                 <defaultItem default="0" include="825"/>
-                <defaultItem default="3" include="846"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumPrimeMover2Athearn.xml"/>
                 <label>Prime Mover Select</label>
                 <tooltip>Select one of prime mover sound effects</tooltip>
@@ -337,18 +361,18 @@
             <!-- End Sound Selection -->
             <!-- Volume Controls follow -->
             <variable CV="128" mask="VVVVVVVV" item="Sound Setting 1" default="199" tooltip="Sets the overall volume of all sound channels">
-                <defaultItem default="150" include="863,864"/>
+                <defaultItem default="150" include="862,863,864,975"/>
                 <defaultItem default="215" include="825"/>
                 <decVal/>
                 <label>Master Volume Control</label>
             </variable>
             <variable CV="129" mask="VVVVVVVV" item="Sound Setting 2" default="100" tooltip="Sets the volume of the airhorn">
-                <defaultItem default="75" include="863,864"/>
+                <defaultItem default="75" include="862,863,864,975"/>
                 <decVal/>
                 <label>Airhorn Volume</label>
             </variable>
             <variable CV="130" mask="VVVVVVVV" item="Sound Setting 3" default="58" tooltip="Sets the volume of the bell">
-                <defaultItem default="40" include="863,864"/>
+                <defaultItem default="40" include="862,863,864,975"/>
                 <defaultItem default="215" include="825"/>
                 <decVal/>
                 <label>Bell Volume</label>
@@ -376,42 +400,42 @@
                 <label>Poppet Valve Volume</label>
             </variable>
             <variable item="Equalizer Control" CV="225" mask="XXXXXVVV" default="3" tooltip="Selects one of six equalizer presets or selects a user adjustable profile">
-                <defaultItem default="7" include="863,864"/>
+                <defaultItem default="7" include="862,863,864,975"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumEQ.xml"/>
                 <label>Equalizer Control</label>
             </variable>
             <variable item="62 Hz Cut/Boost" CV="226" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
-                <defaultItem default="0" include="863,864"/>
+                <defaultItem default="0" include="862,863,864,975"/>
                 <decVal/>
                 <label>62 Hz Cut/Boost</label>
             </variable>
             <variable item="125 Hz Cut/Boost" CV="227" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
-                <defaultItem default="0" include="863,864"/>
+                <defaultItem default="0" include="862,863,864,975"/>
                 <decVal/>
                 <label>125 Hz Cut/Boost</label>
             </variable>
             <variable item="250 Hz Cut/Boost" CV="228" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
-                <defaultItem default="150" include="863,864"/>
+                <defaultItem default="150" include="862,863,864,975"/>
                 <decVal/>
                 <label>250 Hz Cut/Boost</label>
             </variable>
             <variable item="500 Hz Cut/Boost" CV="229" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
-                <defaultItem default="175" include="863,864"/>
+                <defaultItem default="175" include="862,863,864,975"/>
                 <decVal/>
                 <label>500 Hz Cut/Boost</label>
             </variable>
             <variable item="1K Hz Cut/Boost" CV="230" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
-                <defaultItem default="100" include="863,864"/>
+                <defaultItem default="100" include="862,863,864,975"/>
                 <decVal/>
                 <label>1K Hz Cut/Boost</label>
             </variable>
             <variable item="2K Hz Cut/Boost" CV="231" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
-                <defaultItem default="150" include="863,864"/>
+                <defaultItem default="150" include="862,863,864,975"/>
                 <decVal/>
                 <label>2K Hz Cut/Boost</label>
             </variable>
             <variable item="4K Hz Cut/Boost" CV="232" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
-                <defaultItem default="150" include="863,864"/>
+                <defaultItem default="150" include="862,863,864,975"/>
                 <decVal/>
                 <label>4K Hz Cut/Boost</label>
             </variable>
diff --git a/xml/decoders/SoundTraxx_Tsu2_Diesel_OEM_Genesis.xml b/xml/decoders/SoundTraxx_Tsu2_Diesel_OEM_Genesis.xml
index f78a813ddab..6ee6a994e51 100644
--- a/xml/decoders/SoundTraxx_Tsu2_Diesel_OEM_Genesis.xml
+++ b/xml/decoders/SoundTraxx_Tsu2_Diesel_OEM_Genesis.xml
@@ -79,6 +79,12 @@
             <authorinitials>MM</authorinitials>
             <revremark>Move outputs to family level</revremark>
         </revision>
+        <revision>
+            <revnumber>9</revnumber>
+            <date>2019-09-04</date>
+            <authorinitials>MM</authorinitials>
+            <revremark>Add SD70ACe model</revremark>
+        </revision>
     </revhistory>
     <!-- Decoder Model information follows -->
     <decoder>
@@ -193,6 +199,8 @@
             </model>
             <model model="TSU-GN2200 SD70ACe w/LED" numOuts="6" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="836" comment="Model T0303.001">
             </model>
+            <model model="TSU-GN2208 SD70ACe w/LED" numOuts="8" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="907" comment="Model T0303.005">
+            </model>
             <model model="TSU-GN2200 SD70ACe w/ditch" numOuts="6" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="792" comment="Model T0303.002B">
             </model>
             <model model="TSU-GN2200 SD70M/75M" numOuts="6" numFns="30" maxMotorCurrent="2A" connector="DropIn" productID="778" comment="Model T0301.001B">
@@ -417,17 +425,17 @@
                 <label>F12 controls output Brake</label>
             </variable>
             <variable item="Headlight F0(f) Light Type" CV="49" mask="VXXXXXXX" default="0" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="813,814,835,836,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,836,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>Headlight F0(f) Light Type</label>
             </variable>
             <variable item="Backup Light F0(r) Light Type" CV="50" mask="VXXXXXXX" default="0" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="813,814,835,836,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,836,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>Backup Light F0(r) Light Type</label>
             </variable>
             <variable item="FX5 Effect Selection" CV="51" mask="XXXVVVVV" default="0" minOut="3" tooltip="Determines the effect generated from the FX3 light output">
-                <defaultItem default="0" include="791,802,815,828,831,832,836,852,855,856,857,858,861,870,871"/>
+                <defaultItem default="0" include="791,802,815,828,831,832,836,852,855,856,857,858,861,870,871,907"/>
                 <defaultItem default="2" include="787,788"/>
                 <defaultItem default="3" include="783,786,794,806,813"/>
                 <defaultItem default="5" include="805,830"/>
@@ -445,12 +453,12 @@
                 <label>FX3 Grade Crossing Logic</label>
             </variable>
             <variable item="FX5 Light Type" CV="51" mask="VXXXXXXX" default="0" minOut="3" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>FX3 Light Type</label>
             </variable>
             <variable item="FX6 Effect Selection" CV="52" mask="XXXVVVVV" default="0" minOut="4" tooltip="Determines the effect generated from the FX4 light output">
-                <defaultItem default="0" include="791,802,815,828,831,832,836,852,855,856,857,858,861,870,871"/>
+                <defaultItem default="0" include="791,802,815,828,831,832,836,852,855,856,857,858,861,870,871,907"/>
                 <defaultItem default="2" include="787,788"/>
                 <defaultItem default="3" include="786,794"/>
                 <defaultItem default="5" include="777,795,796,841"/>
@@ -475,12 +483,12 @@
                 <label>FX4 Grade Crossing Logic</label>
             </variable>
             <variable item="FX6 Light Type" CV="52" mask="VXXXXXXX" default="0" minOut="4" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>FX4 Light Type</label>
             </variable>
             <variable item="FX5B Effect Selection" CV="53" mask="XXXVVVVV" default="0" minOut="5" tooltip="Determines the second effect associated with the FX5 light output">
-                <defaultItem default="0" include="791,795,796,802,805,806,815,824,828,830,836,837,838,855,856,857,858,861,870"/>
+                <defaultItem default="0" include="791,795,796,802,805,806,815,824,828,830,836,837,838,855,856,857,858,861,870,907"/>
                 <defaultItem default="3" include="843,848"/>
                 <defaultItem default="5" include="798,799,820,829,832,847,852,871"/>
                 <defaultItem default="7" include="787,831"/>
@@ -501,12 +509,12 @@
                 <label>FX5 Grade Crossing Logic</label>
             </variable>
             <variable item="FX5B Light Type" CV="53" mask="VXXXXXXX" default="0" minOut="5" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>FX5 Light Type</label>
             </variable>
             <variable item="FX6B Effect Selection" CV="54" mask="XXXVVVVV" default="0" minOut="6" tooltip="Determines the second effect associated with the FX6 light output">
-                <defaultItem default="0" include="791,795,796,798,799,802,805,806,815,820,824,828,829,830,836,837,838,855,856,857,858,861,870,871"/>
+                <defaultItem default="0" include="791,795,796,798,799,802,805,806,815,820,824,828,829,830,836,837,838,855,856,857,858,861,870,871,907"/>
                 <defaultItem default="3" include="813,814"/>
                 <defaultItem default="8" include="831"/>
                 <defaultItem default="9" include="785,792,797,800,803,804,816,817,835,845,884"/>
@@ -527,12 +535,12 @@
                 <label>FX6 Grade Crossing Logic</label>
             </variable>
             <variable item="FX6B Light Type" CV="54" mask="VXXXXXXX" default="0" minOut="6" tooltip="Provides special compensation for lighting effect contrast when using LEDs">
-                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
                 <label>FX6 Light Type</label>
             </variable>
             <variable item="FX7 Effect Selection" CV="55" mask="XXXVVVVV" default="0" minOut="7" tooltip="Determines the second effect associated with the FX6 light output">
-                <defaultItem default="0" include="855,856,858,861"/>
+                <defaultItem default="0" include="855,856,858,861,907"/>
                 <defaultItem default="7" include="857"/>
                 <defaultItem default="8" include="870,871"/>
                 <defaultItem default="9" include="835,884"/>
@@ -549,7 +557,7 @@
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSUenumLightType.xml"/>
             </variable>
             <variable item="FX8 Effect Selection" CV="56" mask="XXXVVVVV" default="0" minOut="8" tooltip="Determines the second effect associated with the FX6 light output">
-                <defaultItem default="0" include="855,856,858,861,870"/>
+                <defaultItem default="0" include="855,856,858,861,870,907"/>
                 <defaultItem default="7" include="871"/>
                 <defaultItem default="8" include="857"/>
                 <defaultItem default="9" include="835,884"/>
@@ -608,12 +616,14 @@
                 <label>Backup Light F0(r) Reverse Directional Control</label>
             </variable>
             <variable item="FX5 Reverse Directional Control" CV="58" mask="XXXXXVXX" default="0" minOut="3" tooltip="Check to enable FX3 function output in Reverse direction">
-                <defaultItem default="1" include="777,795,796,798,799,814,820,824,829,830,835,837,838,841,843,848,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="0" include="770,771,772,776,778,779,782,783,784,785,786,787,788,791,792,793,794,797,800,802,803,804,805,806,813,815,816,817,828,831,832,836,840,842,844,845,847,849,852"/>
+                <defaultItem default="1" include="777,795,796,798,799,814,820,824,829,830,835,837,838,841,843,848,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>FX3 Reverse Directional Control</label>
             </variable>
-            <variable item="FX6 Reverse Directional Control" CV="58" mask="XXXXVXXX" default="0" minOut="4" tooltip="Check to enable FX4 function output in Reverse direction">
-                <defaultItem default="1" include="777,783,786,787,788,794,795,796,798,799,806,813,814,820,824,829,830,832,835,837,838,841,843,848,852,855,856,857,858,861,870,871,884"/>
+            <variable item="FX6 Reverse Directional Control" CV="58" mask="XXXXVXXX" default="1" minOut="4" tooltip="Check to enable FX4 function output in Reverse direction">
+                <defaultItem default="0" include="770,771,772,776,778,779,782,784,785,791,792,793,797,800,802,803,804,805,815,816,817,828,831,836,840,842,844,845,847,849"/>
+                <defaultItem default="1" include="777,783,786,787,788,794,795,796,798,799,806,813,814,820,824,829,830,832,835,837,838,841,843,848,852,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>FX4 Reverse Directional Control</label>
             </variable>
@@ -637,25 +647,25 @@
             <variable item="Hyperlight Flash Rate (0-15)" CV="59" mask="XXXXVVVV" default="7" tooltip="Sets the overall flash rate of the Hyperlight effects, 0 is fast, 15 is slow">
                 <defaultItem default="4" include="805"/>
                 <defaultItem default="5" include="795,796,798,799,824,837,838,857,858,861,870,871"/>
-                <defaultItem default="10" include="835,884"/>
+                <defaultItem default="10" include="835,884,907"/>
                 <decVal max="15"/>
                 <label>Hyperlight Flash Rate (0-15)</label>
             </variable>
             <variable item="Grade Crossing Hold Time (0-15)" CV="60" mask="XXXXVVVV" default="4" tooltip="Sets the time (in seconds) an effect will stay on after the horn button is released">
-                <defaultItem default="6" include="835,884"/>
+                <defaultItem default="6" include="835,884,907"/>
                 <defaultItem default="10" include="805"/>
                 <decVal max="15"/>
                 <label>Grade Crossing Hold Time (0-15)</label>
             </variable>
             <variable CV="61" item="Brightness 1" default="153" tooltip="Adjust the brightness level of any output set to the on/off brightness 1 effect">
-                <defaultItem default="50" include="835,870,884"/>
+                <defaultItem default="50" include="835,870,884,907"/>
                 <defaultItem default="70" include="813,814,855,856,857,858,861,871"/>
                 <decVal/>
                 <label>Brightness 1 Level (0-255)</label>
             </variable>
             <variable CV="62" item="Brightness 2" default="153" tooltip="Adjust the brightness level of any output set to the on/off brightness 2 effect">
                 <defaultItem default="50" include="813,814,855,856,857,858,861,871"/>
-                <defaultItem default="70" include="835,870,884"/>
+                <defaultItem default="70" include="835,870,884,907"/>
                 <decVal/>
                 <label>Brightness 2 Level (0-255)</label>
             </variable>
@@ -665,7 +675,7 @@
                 <label>Dimmer Level (0-255)</label>
             </variable>
             <variable CV="64" item="Master Brightness" default="255" tooltip="Adjust the brightness level of all lighting outputs">
-                <defaultItem default="192" include="813,814,835,836,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="192" include="813,814,835,836,855,856,857,858,861,870,871,884,907"/>
                 <decVal/>
                 <label>Master Brightness</label>
             </variable>
@@ -685,8 +695,9 @@
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>Low-pressure alarm bell</label>
             </variable>
-            <variable CV="112" mask="XXXXXVXX" item="Sound Option 17" default="0" include="835,855,856,857,858,861,870,871,884">
-                <defaultItem default="1" include="835,855,856,884"/>
+            <variable CV="112" mask="XXXXXVXX" item="Sound Option 17" default="0" include="835,855,856,857,858,861,870,871,884,907">
+                <defaultItem default="0" include="857,858,861,870,871"/>
+                <defaultItem default="1" include="835,855,856,884,907"/>
                 <enumVal>
                     <enumChoice>
                         <choice>Steam Generator</choice>
@@ -702,7 +713,7 @@
                         for passenger cars in the train.
                         &lt;/html&gt;</tooltip>
             </variable>
-            <variable CV="112" mask="XXXXVXXX" item="Sound Option 18" default="0" include="835,855,856,857,858,861,870,871,884">
+            <variable CV="112" mask="XXXXVXXX" item="Sound Option 18" default="0" include="835,855,856,857,858,861,870,871,884,907">
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label>True-Idle Enable</label>
                 <tooltip>&lt;html&gt;
@@ -734,7 +745,7 @@
                 <defaultItem default="3" include="815,816,817,855,856"/>
                 <defaultItem default="4" include="797"/>
                 <defaultItem default="6" include="800,804,835"/>
-                <defaultItem default="8" include="791,792,836"/>
+                <defaultItem default="8" include="791,792,836,907"/>
                 <defaultItem default="10" include="806"/>
                 <defaultItem default="11" include="776,777,778,779,786,794,824,845"/>
                 <defaultItem default="15" include="848"/>
@@ -764,6 +775,7 @@
                 <defaultItem default="13" include="817,856"/>
                 <defaultItem default="17" include="787,788,793,794,795,796,806,861,870,871"/>
                 <defaultItem default="20" include="797,800,802,803,804,805"/>
+                <defaultItem default="21" include="907"/>
                 <defaultItem default="24" include="824,837,838,857"/>
                 <defaultItem default="36" include="791,792,815,816,835,836,852,855,884"/>
                 <defaultItem default="37" include="799"/>
@@ -811,15 +823,34 @@
                 </enumVal>
                 <label>Prime Mover Select</label>
             </variable>
-            <variable CV="123" mask="XXXXVVVV" item="Sound Option 5" include="778,779,791,792,802,803,804,805,836,884" default="1" tooltip="Select one of prime mover sound effects">
+            <variable CV="123" mask="XXXXVVVV" item="Sound Option 5" include="778,779,791,792,802,803,804,805,836" default="1" tooltip="Select one of prime mover sound effects">
                 <defaultItem default="0" include="778,779"/>
                 <defaultItem default="1" include="802,803,804,805"/>
-                <defaultItem default="2" include="791,792,836,884"/>
+                <defaultItem default="2" include="791,792,836"/>
                 <enumVal>
                     <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSU2enumChoiceDieselEMD710Athearn.xml"/>
                 </enumVal>
                 <label>Prime Mover Select</label>
             </variable>
+            <variable CV="123" mask="XXXXVVVV" item="Sound Option 5" include="884,907" default="2" tooltip="Select one of prime mover sound effects">
+                <defaultItem default="2" include="884"/>
+                <defaultItem default="3" include="907"/>
+                <enumVal>
+                    <enumChoice>
+                        <choice>EMD 710G3A 12 cyl</choice>
+                    </enumChoice>
+                    <enumChoice>
+                        <choice>EMD 710G3 16 cyl V1</choice>
+                    </enumChoice>
+                    <enumChoice>
+                        <choice>EMD 710G3 16 cyl V2</choice>
+                    </enumChoice>
+                    <enumChoice>
+                        <choice>EMD 710G3C-T2 16 cyl</choice>
+                    </enumChoice>
+                </enumVal>
+                <label>Prime Mover Select</label>
+            </variable>
             <variable CV="123" mask="XXXXVVVV" item="Sound Option 5" include="816,815,817,855,856" default="4" tooltip="Select one of prime mover sound effects">
                 <enumVal>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSU2enumChoiceDieselGEAthearn.xml"/>
@@ -858,11 +889,13 @@
             <variable CV="124" mask="XXXXXXVV" item="Sound Option 10" default="3" tooltip="Select one of air compressor sound effects">
                 <defaultItem default="0" include="770,771,772,782,783,787,788,791,792,793,794,795,796,806,813,814,824,836,837,838,857,858,861,870,871"/>
                 <defaultItem default="2" include="815,816,817,855,856"/>
+                <defaultItem default="3" include="776,777,778,779,784,785,786,797,798,799,800,802,803,804,805,820,828,829,830,831,832,835,840,841,842,843,844,845,847,848,849,852,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/TSU2enumDieselComp.xml"/>
                 <label>Air Compressor Select</label>
             </variable>
-            <variable CV="125" mask="XXXXXVVV" item="Sound Option 16" default="0" include="835,855,856,857,858,861,870,871,884">
-                <defaultItem default="1" include="835,855,856,884"/>
+            <variable CV="125" mask="XXXXXVVV" item="Sound Option 16" default="0" include="835,855,856,857,858,861,870,871,884,907">
+                <defaultItem default="0" include="857,858,861,870,871"/>
+                <defaultItem default="1" include="835,855,856,884,907"/>
                 <enumVal>
                     <enumChoice>
                         <choice>Poppet Valve</choice>
@@ -883,7 +916,7 @@
             <!-- End Sound Selection -->
             <!-- Volume Controls follow -->
             <variable CV="128" mask="VVVVVVVV" item="Sound Setting 1" default="225" tooltip="Sets the overall volume of all sound channels">
-                <defaultItem default="100" include="836"/>
+                <defaultItem default="100" include="836,907"/>
                 <defaultItem default="110" include="855,856"/>
                 <defaultItem default="125" include="835,884"/>
                 <defaultItem default="150" include="840,841,842,843,844,845"/>
@@ -899,7 +932,7 @@
                 <defaultItem default="160" include="855,856"/>
                 <defaultItem default="190" include="813,814"/>
                 <defaultItem default="192" include="830,831,832"/>
-                <defaultItem default="200" include="791,792,802,803,804,805,835,836,884"/>
+                <defaultItem default="200" include="791,792,802,803,804,805,835,836,884,907"/>
                 <decVal/>
                 <label>Airhorn Volume</label>
             </variable>
@@ -915,14 +948,14 @@
                 <defaultItem default="140" include="778,779"/>
                 <defaultItem default="150" include="815,816,817"/>
                 <defaultItem default="155" include="813,814,855,856"/>
-                <defaultItem default="200" include="791,792,806,830,831,832,836"/>
+                <defaultItem default="200" include="791,792,806,830,831,832,836,907"/>
                 <defaultItem default="225" include="824,828,829,837,838,857,858,861,870,871"/>
                 <defaultItem default="230" include="802,803,804,805,835,884"/>
                 <decVal/>
                 <label>Prime Mover Volume</label>
             </variable>
             <variable CV="132" mask="VVVVVVVV" item="Sound Setting 5" default="30" tooltip="Sets the volume of the air compressor">
-                <defaultItem default="50" include="778,779,791,792,802,803,804,805,835,836,884"/>
+                <defaultItem default="50" include="778,779,791,792,802,803,804,805,835,836,884,907"/>
                 <defaultItem default="115" include="830,831,832"/>
                 <defaultItem default="128" include="815,816,817,828,829"/>
                 <defaultItem default="225" include="855,856"/>
@@ -935,7 +968,7 @@
                 <label>Dynamic Brake Volume</label>
             </variable>
             <variable CV="134" mask="VVVVVVVV" item="Sound Setting 7" default="75" tooltip="Sets the volume of the radiator fans">
-                <defaultItem default="40" include="791,792,802,803,804,805,806,815,816,817,835,836,884"/>
+                <defaultItem default="40" include="791,792,802,803,804,805,806,815,816,817,835,836,884,907"/>
                 <decVal/>
                 <label>Radiator Fans Volume</label>
             </variable>
@@ -953,7 +986,7 @@
                 <label>Poppet Valve Volume</label>
             </variable>
             <variable CV="144" mask="VVVVVVVV" item="Sound Setting 17" default="50" tooltip="Sets the volume of the Steam Generator">
-                <defaultItem default="0" include="835,855,856,857,861,870,871,884"/>
+                <defaultItem default="0" include="835,855,856,857,861,870,871,884,907"/>
                 <decVal/>
                 <label>Steam Generator Volume</label>
             </variable>
@@ -1139,8 +1172,9 @@
                 <decVal/>
                 <label>Constant Brake Distance (0-255)</label>
             </variable>
-            <variable CV="223" item="Sound Group 3 Option 5" default="128" include="835,855,856,857,858,861,870,871,884">
+            <variable CV="223" item="Sound Group 3 Option 5" default="128" include="835,855,856,857,858,861,870,871,884,907">
                 <defaultItem default="88" include="856,857,870"/>
+                <defaultItem default="128" include="835,855,858,871,884,907"/>
                 <defaultItem default="168" include="861"/>
                 <decVal/>
                 <label>Prime Mover Pitch Shift</label>
@@ -1154,12 +1188,12 @@
             </variable>
             <variable CV="224" mask="VVVVVVVV" item="High-Pass Filter Cutoff Frequency" default="20" tooltip="adjust the cutoff frequency of the decoder’s high-pass output filter 1=20Hz, 255=1kHz, 0=disabled">
                 <defaultItem default="10" include="806"/>
-                <defaultItem default="30" include="778,779,791,792,802,803,804,805,815,816,817,835,836,884"/>
+                <defaultItem default="30" include="778,779,791,792,802,803,804,805,815,816,817,835,836,884,907"/>
                 <decVal/>
                 <label>High-Pass Filter Cutoff Frequency</label>
             </variable>
             <variable item="Equalizer Control" CV="225" mask="XXXXXVVV" default="3" tooltip="Selects one of six equalizer presets or selects a user adjustable profile">
-                <defaultItem default="7" include="778,779,782,783,791,792,802,803,804,805,806,813,814,815,816,817,828,829,830,831,832,835,836,855,856,884"/>
+                <defaultItem default="7" include="778,779,782,783,791,792,802,803,804,805,806,813,814,815,816,817,828,829,830,831,832,835,836,855,856,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumEQ.xml"/>
                 <label>Equalizer Control</label>
             </variable>
@@ -1179,7 +1213,7 @@
                 <defaultItem default="140" include="806"/>
                 <defaultItem default="145" include="855,856"/>
                 <defaultItem default="160" include="813,814"/>
-                <defaultItem default="165" include="778,779,782,783,791,792,802,803,804,805,815,816,817,835,836,884"/>
+                <defaultItem default="165" include="778,779,782,783,791,792,802,803,804,805,815,816,817,835,836,884,907"/>
                 <defaultItem default="180" include="828,829,830,831,832"/>
                 <decVal/>
                 <label>250 Hz Cut/Boost</label>
@@ -1187,7 +1221,7 @@
             <variable item="500 Hz Cut/Boost" CV="229" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
                 <defaultItem default="92" include="806"/>
                 <defaultItem default="120" include="855,856"/>
-                <defaultItem default="140" include="778,779,782,783,791,792,802,803,804,805,813,814,815,816,817,835,836,884"/>
+                <defaultItem default="140" include="778,779,782,783,791,792,802,803,804,805,813,814,815,816,817,835,836,884,907"/>
                 <defaultItem default="160" include="830,831,832"/>
                 <decVal/>
                 <label>500 Hz Cut/Boost</label>
@@ -1195,14 +1229,14 @@
             <variable item="1K Hz Cut/Boost" CV="230" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
                 <defaultItem default="55" include="855,856"/>
                 <defaultItem default="100" include="813,814,828,829,830,831,832"/>
-                <defaultItem default="160" include="778,779,782,783,791,792,802,803,804,805,815,816,817,835,836,884"/>
+                <defaultItem default="160" include="778,779,782,783,791,792,802,803,804,805,815,816,817,835,836,884,907"/>
                 <decVal/>
                 <label>1K Hz Cut/Boost</label>
             </variable>
             <variable item="2K Hz Cut/Boost" CV="231" mask="VVVVVVVV" default="128" tooltip="0 = -12dB (Cut) : 128 = 0dB (Flat) : 255 = +12dB (Boost)">
                 <defaultItem default="80" include="855,856"/>
                 <defaultItem default="96" include="806"/>
-                <defaultItem default="140" include="791,792,802,803,804,805,815,816,817,828,829,835,836,884"/>
+                <defaultItem default="140" include="791,792,802,803,804,805,815,816,817,828,829,835,836,884,907"/>
                 <defaultItem default="145" include="778,779,782,783"/>
                 <defaultItem default="160" include="830,831,832"/>
                 <decVal/>
@@ -1213,7 +1247,7 @@
                 <defaultItem default="85" include="855,856"/>
                 <defaultItem default="96" include="806"/>
                 <defaultItem default="100" include="813,814"/>
-                <defaultItem default="160" include="791,792,815,816,817,828,829,836"/>
+                <defaultItem default="160" include="791,792,815,816,817,828,829,836,907"/>
                 <defaultItem default="170" include="830,831,832"/>
                 <defaultItem default="200" include="778,779,782,783"/>
                 <decVal/>
@@ -1260,7 +1294,7 @@
                 <tooltip>Check to enable function F23 when the unit is operating in analog power mode</tooltip>
             </variable>
             <variable item="Analog Mode Function Status - F24" CV="242" mask="XXXXVXXX" default="0" minFn="24">
-                <defaultItem default="1" include="855,856,857,858,861,870,871"/>
+                <defaultItem default="1" include="855,856,857,858,861,870,871,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label xml:lang="it">Stato Funzioni in analogico - F24</label>
                 <label xml:lang="fr">État de la fonction en analogique - F24</label>
@@ -1269,7 +1303,7 @@
                 <tooltip>Check to enable function F24 when the unit is operating in analog power mode</tooltip>
             </variable>
             <variable item="Analog Mode Function Status - F25" CV="242" mask="XXXVXXXX" default="0" minFn="25">
-                <defaultItem default="1" include="855,856,857,858,861,870,871"/>
+                <defaultItem default="1" include="855,856,857,858,861,870,871,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <label xml:lang="it">Stato Funzioni in analogico - F25</label>
                 <label xml:lang="fr">État de la fonction en analogique - F25</label>
@@ -1302,22 +1336,22 @@
                 <tooltip>Check to enable function F28 when the unit is operating in analog power mode</tooltip>
             </variable>
             <variable item="Analog Mode Automatic Effects - FWDD" CV="243" mask="XXXXXXXV" default="0">
-                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <tooltip>Sets the status of automatic effects when moving in forward direction in analog power mode</tooltip>
             </variable>
             <variable item="Analog Mode Automatic Effects - REVD" CV="243" mask="XXXXXXVX" default="0">
-                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <tooltip>Sets the status of automatic effects when moving in reverse direction in analog power mode</tooltip>
             </variable>
             <variable item="Analog Mode Automatic Effects - FWDS" CV="243" mask="XXXXXVXX" default="0">
-                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <tooltip>Sets the status of automatic effects when stopped in forward direction in analog power mode</tooltip>
             </variable>
             <variable item="Analog Mode Automatic Effects - REVS" CV="243" mask="XXXXVXXX" default="0">
-                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="813,814,835,855,856,857,858,861,870,871,884,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-disabledEnabled.xml"/>
                 <tooltip>Sets the status of automatic effects when stopped in reverse direction in analog power mode</tooltip>
             </variable>
@@ -1343,7 +1377,7 @@
                 <label>Consist Address Active For F23</label>
             </variable>
             <variable CV="246" mask="XXXXVXXX" item="Consist Address Active For F24" default="0" minFn="24">
-                <defaultItem default="1" include="855,856,857,858,861,870,871"/>
+                <defaultItem default="1" include="855,856,857,858,861,870,871,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
                 <label xml:lang="it">Indirizzo Consist Attivo per F24</label>
                 <label xml:lang="fr">Adresse d'Unité Multiple active pour F24</label>
@@ -1351,7 +1385,7 @@
                 <label>Consist Address Active For F24</label>
             </variable>
             <variable CV="246" mask="XXXVXXXX" item="Consist Address Active For F25" default="0" minFn="25">
-                <defaultItem default="1" include="855,856,857,858,861,870,871"/>
+                <defaultItem default="1" include="855,856,857,858,861,870,871,907"/>
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-LocoAddrConsistAddr.xml"/>
                 <label xml:lang="it">Indirizzo Consist Attivo per F25</label>
                 <label xml:lang="fr">Adresse d'Unité Multiple active pour F25</label>
@@ -1380,7 +1414,7 @@
                 <label>Consist Address Active For F28</label>
             </variable>
             <variable CV="247" mask="XXXXXXXV" item="Consist Automatic Effects - FWDD" default="1">
-                <defaultItem default="1" include="835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="835,855,856,857,858,861,870,871,884,907"/>
                 <enumVal>
                     <enumChoice>
                         <choice>Effect Function Controlled</choice>
@@ -1392,7 +1426,7 @@
                 <tooltip>Sets the status of automatic effects when moving in forward direction</tooltip>
             </variable>
             <variable CV="247" mask="XXXXXXVX" item="Consist Automatic Effects - REVD" default="0">
-                <defaultItem default="1" include="835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="835,855,856,857,858,861,870,871,884,907"/>
                 <enumVal>
                     <enumChoice>
                         <choice>Effect Function Controlled</choice>
@@ -1404,7 +1438,7 @@
                 <tooltip>Sets the status of automatic effects when moving in reverse direction</tooltip>
             </variable>
             <variable CV="247" mask="XXXXXVXX" item="Consist Automatic Effects - FWDS" default="0">
-                <defaultItem default="1" include="835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="835,855,856,857,858,861,870,871,884,907"/>
                 <enumVal>
                     <enumChoice>
                         <choice>Effect Function Controlled</choice>
@@ -1416,7 +1450,7 @@
                 <tooltip>Sets the status of automatic effects when stopped in forward direction</tooltip>
             </variable>
             <variable CV="247" mask="XXXXVXXX" item="Consist Automatic Effects - REVS" default="0">
-                <defaultItem default="1" include="835,855,856,857,858,861,870,871,884"/>
+                <defaultItem default="1" include="835,855,856,857,858,861,870,871,884,907"/>
                 <enumVal>
                     <enumChoice>
                         <choice>Effect Function Controlled</choice>
@@ -1441,7 +1475,7 @@
             <!-- Extended Function Map -->
             <variable CV="1.259" item="Extended Function Map FX3 Effect" default="5" minOut="3">
                 <defaultItem default="6" include="855,856"/>
-                <defaultItem default="24" include="857,858,861,870,871"/>
+                <defaultItem default="24" include="857,858,861,870,871,907"/>
                 <defaultItem default="255" include="805,835,884"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumFnMap.xml"/>
                 <label>FX3 Effect</label>
@@ -1449,21 +1483,21 @@
             </variable>
             <variable CV="1.260" item="Extended Function Map FX4 Effect" default="5" minOut="4">
                 <defaultItem default="6" include="813,814,835,852,855,856,884"/>
-                <defaultItem default="25" include="857,858,861,870,871"/>
+                <defaultItem default="25" include="857,858,861,870,871,907"/>
                 <defaultItem default="255" include="783,805,806"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumFnMap.xml"/>
                 <label>FX4 Effect</label>
                 <tooltip>Mapping function keys F0-F28 to any of the decoder's effects</tooltip>
             </variable>
             <variable CV="1.261" item="Extended Function Map FX5 Effect" default="6" minOut="5">
-                <defaultItem default="5" include="797,798,799,800,802,803,804,815,816,817,820,829,835,836,845,855,856,884"/>
+                <defaultItem default="5" include="797,798,799,800,802,803,804,815,816,817,820,829,835,836,845,855,856,884,907"/>
                 <defaultItem default="255" include="786,788,794,813,814"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumFnMap.xml"/>
                 <label>FX5 Effect</label>
                 <tooltip>Mapping function keys F0-F28 to any of the decoder's effects</tooltip>
             </variable>
             <variable CV="1.262" item="Extended Function Map FX6 Effect" default="6" minOut="6">
-                <defaultItem default="5" include="797,800,802,803,804,815,816,817,835,836,845,855,856,884"/>
+                <defaultItem default="5" include="797,800,802,803,804,815,816,817,835,836,845,855,856,884,907"/>
                 <defaultItem default="255" include="787,813,814"/>
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumFnMap.xml"/>
                 <label>FX6 Effect</label>
@@ -1535,7 +1569,7 @@
                 <label>Fuel Loading</label>
                 <tooltip>Mapping function keys F0-F28 to any of the decoder's effects</tooltip>
             </variable>
-            <variable CV="1.314" item="Extended Function Map Straight-to-Idle" default="19" include="835,855,856,857,858,861,870,871,884">
+            <variable CV="1.314" item="Extended Function Map Straight-to-Idle" default="19" include="835,855,856,857,858,861,870,871,884,907">
                 <xi:include href="http://jmri.org/xml/decoders/soundtraxx/ECOenumFnMap.xml"/>
                 <label>Straight-to-Idle</label>
                 <tooltip>Mapping function keys F0-F28 to any of the decoder's effects</tooltip>
@@ -1894,23 +1928,23 @@
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-DisableEnable_01.xml"/>
                 <tooltip>Sets the status of automatic effects when in emergency stop</tooltip>
             </variable>
-            <variable CV="1.442" mask="XXXXXXXV" item="Straight-to-Idle Automatic Effects - FWDD" default="0" include="835,855,856,857,858,861,870,871,884">
+            <variable CV="1.442" mask="XXXXXXXV" item="Straight-to-Idle Automatic Effects - FWDD" default="0" include="835,855,856,857,858,861,870,871,884,907">
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-DisableEnable_01.xml"/>
                 <tooltip>Sets the status of automatic effects when moving in forward direction</tooltip>
             </variable>
-            <variable CV="1.442" mask="XXXXXXVX" item="Straight-to-Idle Automatic Effects - REVD" default="0" include="835,855,856,857,858,861,870,871,884">
+            <variable CV="1.442" mask="XXXXXXVX" item="Straight-to-Idle Automatic Effects - REVD" default="0" include="835,855,856,857,858,861,870,871,884,907">
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-DisableEnable_01.xml"/>
                 <tooltip>Sets the status of automatic effects when moving in reverse direction</tooltip>
             </variable>
-            <variable CV="1.442" mask="XXXXXVXX" item="Straight-to-Idle Automatic Effects - FWDS" default="0" include="835,855,856,857,858,861,870,871,884">
+            <variable CV="1.442" mask="XXXXXVXX" item="Straight-to-Idle Automatic Effects - FWDS" default="0" include="835,855,856,857,858,861,870,871,884,907">
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-DisableEnable_01.xml"/>
                 <tooltip>Sets the status of automatic effects when stopped in forward direction</tooltip>
             </variable>
-            <variable CV="1.442" mask="XXXXVXXX" item="Straight-to-Idle Automatic Effects - REVS" default="0" include="835,855,856,857,858,861,870,871,884">
+            <variable CV="1.442" mask="XXXXVXXX" item="Straight-to-Idle Automatic Effects - REVS" default="0" include="835,855,856,857,858,861,870,871,884,907">
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-DisableEnable_01.xml"/>
                 <tooltip>Sets the status of automatic effects when stopped in reverse direction</tooltip>
             </variable>
-            <variable CV="1.442" mask="XXXVXXXX" item="Straight-to-Idle Automatic Effects - ESTP" default="0" include="835,855,856,857,858,861,870,871,884">
+            <variable CV="1.442" mask="XXXVXXXX" item="Straight-to-Idle Automatic Effects - ESTP" default="0" include="835,855,856,857,858,861,870,871,884,907">
                 <xi:include href="http://jmri.org/xml/decoders/parts/enum-DisableEnable_01.xml"/>
                 <tooltip>Sets the status of automatic effects when in emergency stop</tooltip>
             </variable>
@@ -1919,7 +1953,7 @@
                 <defaultItem default="80" include="855,856"/>
                 <defaultItem default="95" include="813,814"/>
                 <defaultItem default="96" include="830,831,832"/>
-                <defaultItem default="100" include="791,792,802,803,804,805,835,836,884"/>
+                <defaultItem default="100" include="791,792,802,803,804,805,835,836,884,907"/>
                 <decVal/>
                 <label>Airhorn Alt Volume</label>
             </variable>
@@ -1935,14 +1969,14 @@
                 <defaultItem default="70" include="778,779"/>
                 <defaultItem default="75" include="815,816,817"/>
                 <defaultItem default="78" include="813,814,855,856"/>
-                <defaultItem default="100" include="791,792,806,830,831,832,836"/>
+                <defaultItem default="100" include="791,792,806,830,831,832,836,907"/>
                 <defaultItem default="112" include="824,828,829,837,838,857,858,861,870,871"/>
                 <defaultItem default="115" include="802,803,804,805,835,884"/>
                 <decVal/>
                 <label>Prime Mover Alt Volume</label>
             </variable>
             <variable CV="2.292" mask="VVVVVVVV" item="Alt Sound Setting 4" default="15" tooltip="Set the alternate volume levels of each sound effect">
-                <defaultItem default="25" include="778,779,791,792,802,803,804,805,835,836,884"/>
+                <defaultItem default="25" include="778,779,791,792,802,803,804,805,835,836,884,907"/>
                 <defaultItem default="57" include="830,831,832"/>
                 <defaultItem default="64" include="815,816,817,828,829"/>
                 <defaultItem default="113" include="855,856"/>
@@ -1955,7 +1989,7 @@
                 <label>Dynamic Brake Alt Volume</label>
             </variable>
             <variable CV="2.294" mask="VVVVVVVV" item="Alt Sound Setting 6" default="37" tooltip="Set the alternate volume levels of each sound effect">
-                <defaultItem default="20" include="791,792,802,803,804,805,806,815,816,817,835,836,884"/>
+                <defaultItem default="20" include="791,792,802,803,804,805,806,815,816,817,835,836,884,907"/>
                 <decVal/>
                 <label>Radiator Fans Alt Volume</label>
             </variable>
@@ -1985,7 +2019,7 @@
                 <label>Poppet Valve Alt Volume</label>
             </variable>
             <variable CV="2.304" mask="VVVVVVVV" item="Alt Sound Setting 16" default="25" tooltip="Set the alternate volume levels of each sound effect">
-                <defaultItem default="0" include="835,855,856,857,861,870,871,884"/>
+                <defaultItem default="0" include="835,855,856,857,861,870,871,884,907"/>
                 <decVal/>
                 <label>Steam Generator Alt Volume</label>
             </variable>
@@ -2076,7 +2110,7 @@
                 <label>Load Sensitivity</label>
             </variable>
             <variable CV="3.257" mask="XXXXXXVV" item="Sound Group 1 Option 1" default="1">
-                <defaultItem default="2" include="778,779,791,792,802,803,804,805,813,814,815,816,817,820,835,836,855,856,884"/>
+                <defaultItem default="2" include="778,779,791,792,802,803,804,805,813,814,815,816,817,820,835,836,855,856,884,907"/>
                 <enumVal>
                     <enumChoice value="1">
                         <choice>2 axles per truck</choice>