diff --git a/Input/Joysticks/Logitech/extreme-3d-pro.xml b/Input/Joysticks/Logitech/extreme-3d-pro.xml
index 69ea50f01..fa5c3d511 100644
--- a/Input/Joysticks/Logitech/extreme-3d-pro.xml
+++ b/Input/Joysticks/Logitech/extreme-3d-pro.xml
@@ -58,52 +58,8 @@ $Id$
  <axis n="3">
   <desc>Throttle</desc>
   <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[0]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[1]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[2]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[3]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[4]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[5]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[6]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[7]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
+   <command>nasal</command>
+   <script>controls.throttleAxis()</script>
   </binding>
  </axis>
 
@@ -151,33 +107,23 @@ $Id$
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/gear/wheel[0]/brake</property>
+   <property>/controls/gear/brake-left</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/gear/wheel[1]/brake</property>
-   <value type="double">1.0</value>
-  </binding>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/wheel[2]/brake</property>
+   <property>/controls/gear/brake-right</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/gear/wheel[0]/brake</property>
+    <property>/controls/gear/brake-left</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/gear/wheel[1]/brake</property>
-    <value type="double">0.0</value>
-   </binding>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/wheel[2]/brake</property>
+    <property>/controls/gear/brake-right</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -227,13 +173,13 @@ $Id$
   <desc>Right brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/gear/wheel[1]/brake</property>
+   <property>/controls/gear/brake-right</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/gear/wheel[1]/brake</property>
+    <property>/controls/gear/brake-right</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -243,13 +189,13 @@ $Id$
   <desc>Left brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/gear/wheel[0]/brake</property>
+   <property>/controls/gear/brake-left</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/gear/wheel[0]/brake</property>
+    <property>/controls/gear/brake-left</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>