@@ -218,23 +218,23 @@ var APClass = {

                 setprop('/it-stec55x/input/ap-master-sw', 1);

             },

             updateDisplay: func {

-                var armed     = '';

-                var active    = '';

-                var reference = '';

+                var vert_armed     = '';

+                var vert_active    = '';

+                var vert_reference = '';

                 if (stec55x.ALT_annun.getBoolValue()) {

-                    active    = 'ALT';

-                    reference = sprintf('%5d ft', abs(data.alt - afcs.getValue('selected-alt-ft')) < 150 ? afcs.getValue('selected-alt-ft') : math.round(data.alt, 10));

-                    armed     = sprintf('%.2f inHg', stec55x.alt.getValue());

+                    vert_active    = 'ALT';

+                    vert_reference = sprintf('%.2f inHg', stec55x.alt.getValue());

+                    vert_armed     = sprintf('%5d ft', abs(data.alt - afcs.getValue('selected-alt-ft')) < 150 ? afcs.getValue('selected-alt-ft') : math.round(data.alt, 10));

                 }

                 elsif (stec55x.VS_annun.getBoolValue()) {

-                    active    = 'VS';

-                    reference = sprintf('%s%4d fpm',

+                    vert_active    = 'VS';

+                    vert_reference = sprintf('%s%4d fpm',

                                     utf8.chstr(stec55x.vs.getValue() > 0 ? 9650 : 9660),

                                     math.abs(math.round(stec55x.vs.getValue(), 10)));

                 }

                 elsif (stec55x.GSArmed.getBoolValue()) {

-                    armed  = 'VPATH';

-                    active = 'GS';

+                    vert_armed  = 'GS';

+                    vert_active = 'VPATH';

                 }

                 var ap_state = [];

@@ -247,32 +247,24 @@ var APClass = {

                 else

                     ap_state = ["", "black", "black"];

+                var lat_active = '';

+                foreach (var m; ['HDG', 'NAV', 'APR'])

+                    if (stec55x[m ~ "_annun"].getBoolValue()) {

+                        lat_active = m;

+                        break;

+                    }

+

                 foreach (var terminal; me.terminals) {

                     var se = flightdeck[terminal].display.screenElements;

-                    se['VERMOD-Active-text'].setVisible(size(active)).setText(active);

-                    se['VERMOD-Armed-text'].setVisible(size(armed)).setText(armed);

-                    se['VERMOD-Reference-text'].setVisible(size(reference)).setText(reference);

+                    se['VERMOD-Active-text'].setVisible(size(vert_active)).setText(vert_active);

+                    se['VERMOD-Armed-text'].setVisible(size(vert_armed)).setText(vert_armed);

+                    se['VERMOD-Reference-text'].setVisible(size(vert_reference)).setText(vert_reference);

                     se['AP-Status-text'].setColorFill(flightdeck[terminal].display.colors[ap_state[2]])

                                         .setColor(ap_state[1])

                                         .setVisible(size(ap_state[0]))

                                         .setText(ap_state[0]);

                     se['YD-Status-text'].setVisible(stec55x.yaw.getValue() != -1);

-                    if (stec55x.rollMode  != -1) {

-                        se['LATMOD-Active-text'].setVisible(1).setText('ROL');

-                        var armed = '';

-                        foreach (var m; [ 'NAV', 'CNAV', 'REV', 'CREV' ])

-                            if (stec55x[m]) armed = m;

-                        if (stec55x.roll.getValue() == 0) armed = 'HDG';

-                        elsif (stec55x.roll.getValue() == 2) armed = 'GPS';

-                        elsif (stec55x.APR_annun.getValue()) armed = 'LOC';

-                        se['LATMOD-Armed-text']

-                            .setVisible(size(armed))

-                            .setText(armed);

-                    }

-                    else {

-                        se['LATMOD-Active-text'].setVisible(0);

-                        se['LATMOD-Armed-text'].setVisible(0);

-                    }

+                    se['LATMOD-Active-text'].setVisible(size(lat_active)).setText(lat_active);

                 }

             },