diff --git a/Aircraft/Instruments-3d/vor/vor.ac b/Aircraft/Instruments-3d/vor/vor.ac
index 343955c69..f53647c8b 100644
--- a/Aircraft/Instruments-3d/vor/vor.ac
+++ b/Aircraft/Instruments-3d/vor/vor.ac
@@ -4,33 +4,25 @@ MATERIAL "ac3dmat1" rgb 1 1 1  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10
 MATERIAL "ac3dmat6" rgb 0 1 0  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 1
 MATERIAL "DefaultWhite" rgb 1 1 1  amb 1 1 1  emis 0.15 0.15 0.15  spec 0.5 0.5 0.5  shi 64  trans 0
 OBJECT world
-kids 14
+kids 13
 OBJECT poly
-name "GlideslopeNeedlePark"
-loc -0.003005 0 -0.00318549
+name "GS_in_range"
+loc -0.00526316 -0.000228833 0.0199084
+texture "GS.rgb"
 crease 45.000000
-numvert 6
-0 0.000533 0.0187818
-0 0.000533 -0.0124695
-0 -0.000532 -0.0124695
-0 0.000533 0.00311013
-0 -0.000532 0.0187818
-0 -0.000532 0.00311013
-numsurf 2
-SURF 0x0
-mat 3
+numvert 4
+0 -0.00503432 -0.00480549
+0 -0.00503432 0.00389016
+0 0.00572082 0.00389016
+0 0.00572082 -0.00480549
+numsurf 1
+SURF 0x30
+mat 0
 refs 4
-5 0 0
-3 0 0
-0 0 0
-4 0 0
-SURF 0x0
-mat 3
-refs 4
-5 0 0
-2 0 0
-1 0 0
-3 0 0
+3 0.484375 0.828125
+2 0.046875 0.828125
+1 0.046875 0.109375
+0 0.484375 0.109375
 kids 0
 OBJECT poly
 name "GS_out_of_range"
@@ -486,22 +478,3 @@ refs 4
 3 0.125 0
 1 0.125 1
 kids 0
-OBJECT poly
-name "GS_in_range"
-loc -0.00526316 -0.000915332 0.0210526
-texture "GS.rgb"
-crease 45.000000
-numvert 4
-0 -0.00503432 -0.00480549
-0 -0.00503432 0.00389016
-0 0.00572082 0.00389016
-0 0.00572082 -0.00480549
-numsurf 1
-SURF 0x30
-mat 0
-refs 4
-3 0.484375 0.828125
-2 0.046875 0.828125
-1 0.046875 0.109375
-0 0.484375 0.109375
-kids 0
diff --git a/Aircraft/Instruments-3d/vor/vor.xml b/Aircraft/Instruments-3d/vor/vor.xml
index 02ac5ba9c..5f063dbf1 100644
--- a/Aircraft/Instruments-3d/vor/vor.xml
+++ b/Aircraft/Instruments-3d/vor/vor.xml
@@ -6,8 +6,8 @@
   <nav-to-flag>/instrumentation/nav[0]/to-flag</nav-to-flag>
   <nav-from-flag>/instrumentation/nav[0]/from-flag</nav-from-flag>
   <nav-radial-selected>/instrumentation/nav[0]/radials/selected-deg</nav-radial-selected>
-  <nav-gs-needle-deflection>/instrumentation/nav[0]/gs-needle-deflection-norm</nav-gs-needle-deflection>
-  <nav-heading-needle-deflection>/instrumentation/nav[0]/heading-needle-deflection</nav-heading-needle-deflection>
+  <nav-gs-needle-deflection>/instrumentation/nav[0]/filtered-gsNAV0-deflection</nav-gs-needle-deflection>
+  <nav-heading-needle-deflection>/instrumentation/nav[0]/filtered-cdiNAV0-deflection</nav-heading-needle-deflection>
   <nav-in-range>/instrumentation/nav[0]/in-range</nav-in-range>
   <gs-in-range>/instrumentation/nav[0]/gs-in-range</gs-in-range>
  </params>
@@ -18,7 +18,6 @@
   <type>material</type>
   <object-name>Face</object-name>
   <object-name>GlideslopeNeedle</object-name>
-  <object-name>GlideslopeNeedlePark</object-name>
   <object-name>Ring</object-name>
   <object-name>LocalizerNeedle</object-name>
   <object-name>Front</object-name>
@@ -64,14 +63,6 @@
   </axis>
  </animation>
 
- <animation>
-  <type>select</type>
-  <object-name>GlideslopeNeedle</object-name>
-  <condition>
-   <property alias="../../../params/gs-in-range"/>
-  </condition>
- </animation>
-
  <animation>
   <type>select</type>
   <object-name>GS_in_range</object-name>
@@ -83,7 +74,6 @@
  <animation>
   <type>select</type>
   <object-name>GS_out_of_range</object-name>
-  <object-name>GlideslopeNeedlePark</object-name>
   <condition>
    <not>
     <property alias="../../../../params/gs-in-range"/>
@@ -117,9 +107,6 @@
   </condition>
  </animation>
 
-
-  
-
  <animation>
   <name>GlideslopeNeedleTransform</name>
   <type>rotate</type>
diff --git a/Aircraft/Instruments-3d/vor/vor2.xml b/Aircraft/Instruments-3d/vor/vor2.xml
index 491b10a2c..1a0d6e323 100644
--- a/Aircraft/Instruments-3d/vor/vor2.xml
+++ b/Aircraft/Instruments-3d/vor/vor2.xml
@@ -6,8 +6,8 @@
   <nav-to-flag>/instrumentation/nav[1]/to-flag</nav-to-flag>
   <nav-from-flag>/instrumentation/nav[1]/from-flag</nav-from-flag>
   <nav-radial-selected>/instrumentation/nav[1]/radials/selected-deg</nav-radial-selected>
-  <nav-gs-needle-deflection>/instrumentation/nav[1]/gs-needle-deflection-norm</nav-gs-needle-deflection>
-  <nav-heading-needle-deflection>/instrumentation/nav[1]/heading-needle-deflection</nav-heading-needle-deflection>
+  <nav-gs-needle-deflection>/instrumentation/nav[1]/filtered-gsNAV1-deflection</nav-gs-needle-deflection>
+  <nav-heading-needle-deflection>/instrumentation/nav[1]/filtered-cdiNAV1-deflection</nav-heading-needle-deflection>
   <nav-in-range>/instrumentation/nav[1]/in-range</nav-in-range>
   <gs-in-range>/instrumentation/nav[1]/gs-in-range</gs-in-range>
  </params>
@@ -18,7 +18,6 @@
   <type>material</type>
   <object-name>Face</object-name>
   <object-name>GlideslopeNeedle</object-name>
-  <object-name>GlideslopeNeedlePark</object-name>
   <object-name>Ring</object-name>
   <object-name>LocalizerNeedle</object-name>
   <object-name>Front</object-name>
@@ -64,14 +63,6 @@
   </axis>
  </animation>
 
- <animation>
-  <type>select</type>
-  <object-name>GlideslopeNeedle</object-name>
-  <condition>
-   <property alias="../../../params/gs-in-range"/>
-  </condition>
- </animation>
-
  <animation>
   <type>select</type>
   <object-name>GS_in_range</object-name>
@@ -83,7 +74,6 @@
  <animation>
   <type>select</type>
   <object-name>GS_out_of_range</object-name>
-  <object-name>GlideslopeNeedlePark</object-name>
   <condition>
    <not>
     <property alias="../../../../params/gs-in-range"/>
@@ -117,9 +107,6 @@
   </condition>
  </animation>
 
-
-  
-
  <animation>
   <name>GlideslopeNeedleTransform</name>
   <type>rotate</type>