@@ -46,10 +46,8 @@ var deviceClass = {

         m.role = substr(name, 0, 3);

         m.node = zkv.getNode(name, 1);

         m.data = {};

-        foreach (var v; ['Vx', 'Vy', 'Vr', 'Vglide']) {

-            m.data[v] = alerts.getNode(v).getValue();

+        foreach (var v; ['Vx', 'Vy', 'Vr', 'Vglide'])

             m.data[v ~ '-visible'] = 1;

-        }

         m.display  = displayClass.new(m);

         m.display.showInitProgress(m.name);

         m.softkeys = softkeysClass.new(m);

@@ -35,8 +35,6 @@ var displayClass = {

             io.load_nasal(eis_dir ~ eis_type ~ '.nas', 'zkv1000');

         }

-        m._ias_vne = getprop('/instrumentation/zkv1000/alerts/Vne');

-

         return m;

     },

 #}}}

@@ -501,20 +499,20 @@ var displayClass = {

             .setTranslation(0,(math.mod(ias,10) + (ias >= 10)*10) * 36);

         me.screenElements.SpeedTape

             .setTranslation(0,ias * 5.711);

-        if (ias > me._ias_vne and ! me._ias_already_exceeded) { # easier than .getColorFill

+        if (ias > data.Vne and ! me._ias_already_exceeded) { # easier than .getColorFill

             me._ias_already_exceeded = 1;

             me.screenElements['IAS-bg']

                 .setColorFill(1,0,0);

         }

-        elsif (ias < me._ias_vne and me._ias_already_exceeded) { # easier than .getColorFill

+        elsif (ias < data.Vne and me._ias_already_exceeded) { # easier than .getColorFill

             me._ias_already_exceeded = 0;

             me.screenElements['IAS-bg']

                 .setColorFill(0,0,0);

         }

         foreach (var v; ['Vx', 'Vy', 'Vr', 'Vglide']) {

-            if (me.device.data[v ~ '-visible'] and abs(me.device.data[v] - ias) < 30)

+            if (me.device.data[v ~ '-visible'] and abs(data[v] - ias) < 30)

                 me.screenElements['IAS-' ~ v]

-                    .setTranslation(0, (ias - me.device.data[v]) * 5.711)

+                    .setTranslation(0, (ias - data[v]) * 5.711)

                     .show();

             else

                 me.screenElements['IAS-' ~ v]

@@ -92,16 +92,10 @@ var init_props = func {

     alerts.getNode('warning', 1).setBoolValue(0);

     alerts.getNode('alert', 1).setBoolValue(0);

     alerts.getNode('message', 1).setValue('');

-    var v = getprop('/instrumentation/zkv1000/alerts/Vx');

-    alerts.getNode('Vx', 1).setIntValue(v != nil ? v : 999);

-    v = getprop('/instrumentation/zkv1000/alerts/Vy');

-    alerts.getNode('Vy', 1).setIntValue(v != nil ? v : 999);

-    v = getprop('/instrumentation/zkv1000/alerts/Vr');

-    alerts.getNode('Vr', 1).setIntValue(v != nil ? v : 999);

-    v = getprop('/instrumentation/zkv1000/alerts/Vglide');

-    alerts.getNode('Vglide', 1).setIntValue(v != nil ? v : 999);

-    v = getprop('/instrumentation/zkv1000/alerts/Vne');

-    alerts.getNode('Vne', 1).setIntValue(v != nil ? v : 999);

+    foreach (var v; ['Vx', 'Vy', 'Vr', 'Vglide', 'Vne']) {

+        var speed = getprop('/instrumentation/zkv1000/alerts/' ~ v);

+        data[v] = speed != nil ? speed : 9999;

+    }

     afcs = zkv.getNode('afcs',1);

     afcs.getNode('fd-bars-visible',1).setBoolValue(0);