diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas
index e579f1ff..7bb54580 100644
--- a/Models/Instruments/MCDU/MCDU.nas
+++ b/Models/Instruments/MCDU/MCDU.nas
@@ -95,20 +95,22 @@ var canvas_MCDU_base = {
 	},
 	update: func() {
 		if (getprop("/systems/electrical/bus/ac1") >= 110) {
-			MCDU_1.page.show();
 			MCDU_1.update();
+			MCDU_1.updateFast();
 			updateL = 1;
+			MCDU_1.page.show();
 		} else {
-			MCDU_1.page.hide();
 			updateL = 0;
+			MCDU_1.page.hide();
 		}
 		if (getprop("/systems/electrical/bus/ac2") >= 110) {
-			MCDU_2.page.show();
 			MCDU_2.update();
+			MCDU_2.updateFast();
 			updateR = 1;
+			MCDU_2.page.show();
 		} else {
-			MCDU_2.page.hide();
 			updateR = 0;
+			MCDU_2.page.hide();
 		}
 	},
 	updateFast: func() {
diff --git a/Models/Instruments/ND/canvas/res/airbusNDNoMap.png b/Models/Instruments/ND/canvas/res/airbusNDNoMap.png
deleted file mode 100644
index d8ca13ac..00000000
Binary files a/Models/Instruments/ND/canvas/res/airbusNDNoMap.png and /dev/null differ
diff --git a/Models/Instruments/ND/canvas/res/airbusNDNoMap.svg b/Models/Instruments/ND/canvas/res/airbusNDNoMap.svg
deleted file mode 100644
index 520a97a8..00000000
--- a/Models/Instruments/ND/canvas/res/airbusNDNoMap.svg
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="airbusNDNoMap.svg"
-   inkscape:version="0.48.5 r10040"
-   xml:space="preserve"
-   id="svg5180"
-   height="1024"
-   width="1024"
-   version="1.1"
-   inkscape:export-filename="/Users/artix/projects/FlightGear/Aircrafts/A330-200/Models/Instruments/ND/canvas/res/airbusNDNoMap.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"><sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="706"
-     id="namedview102"
-     showgrid="false"
-     inkscape:zoom="0.36"
-     inkscape:cx="-20.989482"
-     inkscape:cy="346.41432"
-     inkscape:window-x="14"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer3"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-to-guides="false"
-     showguides="true"
-     inkscape:guide-bbox="true"><sodipodi:guide
-       id="guide3155"
-       orientation="0,1"
-       position="512,200" /><sodipodi:guide
-       id="guide3167"
-       orientation="1,0"
-       position="512,811.5" /><sodipodi:guide
-       id="guide3177"
-       orientation="-0.5,-0.86602541"
-       position="512,200" /><sodipodi:guide
-       id="guide3179"
-       orientation="-0.866025,-0.5"
-       position="512,200" /><sodipodi:guide
-       position="512,465"
-       orientation="0,1"
-       id="guide4003" /><sodipodi:guide
-       orientation="-0.5,0.8660254"
-       position="512,200"
-       id="guide3537" /><sodipodi:guide
-       orientation="-0.8660254,0.5"
-       position="512,200"
-       id="guide3545" /><sodipodi:guide
-       orientation="-0.17364818,-0.98480775"
-       position="512,200"
-       id="guide3547" /></sodipodi:namedview><metadata
-     id="metadata5186"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><dc:creator><cc:Agent><dc:title>Gijs de Rooy</dc:title></cc:Agent></dc:creator><cc:license
-           rdf:resource="" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs5184"><marker
-       style="overflow:visible"
-       id="TriangleOutL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleOutL"><path
-         transform="scale(0.8)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path3957" /></marker><marker
-       style="overflow:visible;"
-       id="Arrow2Lend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend"><path
-         transform="scale(1.1) rotate(180) translate(1,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path3836" /></marker><clipPath
-       id="clipPath3177"><path
-         id="path3179"
-         d="m 109.44,459.54 194.4,0 0,-216 -194.4,0 0,216 z" /></clipPath><clipPath
-       id="clipPath3133"><path
-         id="path3135"
-         d="m 44.64,520.2 324,0 0,-6.24 -324,0 0,6.24 z" /></clipPath><clipPath
-       id="clipPath3109"><path
-         id="path3111"
-         d="m 44.64,36 324,0 0,-10.08 -324,0 0,10.08 z" /></clipPath><clipPath
-       id="clipPath3095"><path
-         id="path3097"
-         d="m 44.64,36 324,0 0,-10.08 -324,0 0,10.08 z" /></clipPath><clipPath
-       id="clipPath3071"><path
-         id="path3073"
-         d="m 44.64,561.24 324,0 0,-4.32 -324,0 0,4.32 z" /></clipPath><clipPath
-       id="clipPath3035"><path
-         id="path3037"
-         d="m 44.64,594 324,0 0,-28.8 -324,0 0,28.8 z" /></clipPath><clipPath
-       id="clipPath3019"><path
-         id="path3021"
-         d="m 44.64,594 324,0 0,-28.8 -324,0 0,28.8 z" /></clipPath><clipPath
-       id="clipPath4462"
-       clipPathUnits="userSpaceOnUse"><path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4464"
-         d="m 246.487,713.178 0,-420 c 0,0 -0.334,-50 50,-50 l 375,0 c 50.242,0 50,50 50,50 l 0,420 c 0,0 0.359,50 -50,50 l -375,0 c -50.233,0 -50,-50 -50,-50 z"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></clipPath></defs><g
-     style="display:inline"
-     inkscape:label="base"
-     id="layer3"
-     inkscape:groupmode="layer"><text
-       inkscape:label="#text7243"
-       sodipodi:linespacing="125%"
-       id="gs"
-       y="53.306854"
-       x="101.87437"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
-       xml:space="preserve"
-       inkscape:export-filename="/Users/artix/projects/FlightGear/Aircrafts/A330-200/Models/Instruments/ND/canvas/res/airbusNDNoMap.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4097">---</tspan></text>
-<text
-       xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#32f519;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
-       x="248.49673"
-       y="53.306854"
-       id="tas"
-       sodipodi:linespacing="125%"
-       inkscape:label="#text7243"
-       inkscape:export-filename="/Users/artix/projects/FlightGear/Aircrafts/A330-200/Models/Instruments/ND/canvas/res/airbusNDNoMap.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4099">---</tspan></text>
-<text
-       xml:space="preserve"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
-       x="38.276394"
-       y="53.306854"
-       id="gsLbl"
-       sodipodi:linespacing="125%"
-       inkscape:label="#text7243"
-       inkscape:export-filename="/Users/artix/projects/FlightGear/Aircrafts/A330-200/Models/Instruments/ND/canvas/res/airbusNDNoMap.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         style="font-size:36px"
-         sodipodi:role="line"
-         id="tspan3817"
-         x="38.276394"
-         y="53.306854">GS</tspan></text>
-<text
-       inkscape:label="#text7243"
-       sodipodi:linespacing="125%"
-       id="tasLbl"
-       y="53.306854"
-       x="170.17084"
-       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ededed;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
-       xml:space="preserve"
-       inkscape:export-filename="/Users/artix/projects/FlightGear/Aircrafts/A330-200/Models/Instruments/ND/canvas/res/airbusNDNoMap.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         y="53.306854"
-         x="170.17084"
-         id="tspan3821"
-         sodipodi:role="line"
-         style="font-size:36px">TAS</tspan></text>
-<text
-       xml:space="preserve"
-       style="font-size:56px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
-       x="309.88889"
-       y="579.33337"
-       id="text4101"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/Users/artix/projects/FlightGear/Aircrafts/A330-200/Models/Instruments/ND/canvas/res/airbusNDNoMap.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4103"
-         x="309.88889"
-         y="579.33337">NO MAP AVAIL</tspan></text>
-<text
-       sodipodi:linespacing="125%"
-       id="text4105"
-       y="283.33337"
-       x="513.88892"
-       style="font-size:56px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
-       xml:space="preserve"
-       inkscape:export-filename="/Users/artix/projects/FlightGear/Aircrafts/A330-200/Models/Instruments/ND/canvas/res/airbusNDNoMap.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4109"
-         x="513.88892"
-         y="283.33337">HDG</tspan></text>
-</g><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="PLAN"
-     style="display:inline"><g
-       style="display:inline"
-       id="planArcs"
-       inkscape:label="#g3956"
-       transform="matrix(1.02827,0,0,1.0306342,-14.7256,-31.455079)"
-       inkscape:export-filename="/Users/artix/projects/FlightGear/Aircrafts/A330-200/Models/Instruments/ND/canvas/res/airbusNDNoMap.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><path
-         style="fill:none;stroke:#ff0000;stroke-width:3.99999905000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-         d="M 542,956.688 C 767.783,941.437 946.219,753.462 946.219,523.812 946.219,294.164 767.783,106.188 542,90.9375 522,90.94783 502,90.95817 482,90.9685 256.534,106.544 78.4688,294.391 78.4688,523.812 c 0,229.423 178.0652,417.237 403.5312,432.813 20,0.021 40,0.042 60,0.063 z"
-         transform="matrix(0.972507,0,0,0.972507,14.3208,28.3815)"
-         id="path3171"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csccscc" /><path
-         sodipodi:nodetypes="csccscc"
-         inkscape:connector-curvature="0"
-         id="path3232"
-         d="M 483.06917,746.91246 C 380.39674,732.55923 301.36207,644.41995 301.36207,537.79234 c 0,-106.62762 79.0337,-194.79705 181.7071,-209.1493 19.45014,-0.0304 38.90028,-0.061 58.35042,-0.0914 102.99141,14.06829 182.34506,102.38748 182.34506,209.24072 0,106.8542 -79.35365,195.14228 -182.34506,209.21154 -11.39099,3.20745 -45.79654,1.82775 -58.35042,-0.0914"
-         style="fill:none;stroke:#ff0000;stroke-width:3.89002705000000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:32, 16" /></g></g></svg>
\ No newline at end of file
diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas
index ebfea309..01865e2c 100644
--- a/Models/Instruments/PFD/PFD.nas
+++ b/Models/Instruments/PFD/PFD.nas
@@ -163,59 +163,61 @@ var canvas_PFD_base = {
 			PFD_2_mismatch.page.hide();
 			if (getprop("/systems/electrical/bus/ac-ess") >= 110 and getprop("/controls/lighting/DU/du1") > 0) {
 				if (getprop("/instrumentation/du/du1-test-time") + getprop("/instrumentation/du/du1-test-amount") >= elapsedtime and getprop("/modes/cpt-du-xfr") != 1) {
-					PFD_1.page.hide();
-					PFD_1_test.page.show();
 					PFD_1_test.update();
 					updateL = 0;
+					PFD_1.page.hide();
+					PFD_1_test.page.show();
 				} else if (getprop("/instrumentation/du/du2-test-time") + getprop("/instrumentation/du/du2-test-amount") >= elapsedtime and getprop("/modes/cpt-du-xfr") == 1) {
-					PFD_1.page.hide();
-					PFD_1_test.page.show();
 					PFD_1_test.update();
 					updateL = 0;
+					PFD_1.page.hide();
+					PFD_1_test.page.show();
 				} else {
+					PFD_1.updateFast();
+					PFD_1.update();
+					updateL = 1;
 					PFD_1_test.page.hide();
 					PFD_1.page.show();
-					PFD_1.updateFast();
-					updateL = 1;
 				}
 			} else {
+				updateL = 0;
 				PFD_1_test.page.hide();
 				PFD_1.page.hide();
-				updateL = 0;
 			}
 			if (getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/controls/lighting/DU/du6") > 0) {
 				if (getprop("/instrumentation/du/du6-test-time") + getprop("/instrumentation/du/du6-test-amount") >= elapsedtime and getprop("/modes/fo-du-xfr") != 1) {
-					PFD_2.page.hide();
-					PFD_2_test.page.show();
 					PFD_2_test.update();
 					updateR = 0;
+					PFD_2.page.hide();
+					PFD_2_test.page.show();
 				} else if (getprop("/instrumentation/du/du5-test-time") + getprop("/instrumentation/du/du5-test-amount") >= elapsedtime and getprop("/modes/fo-du-xfr") == 1) {
-					PFD_2.page.hide();
-					PFD_2_test.page.show();
 					PFD_2_test.update();
 					updateR = 0;
+					PFD_2.page.hide();
+					PFD_2_test.page.show();
 				} else {
+					PFD_2.updateFast();
+					PFD_2.update();
+					updateR = 1;
 					PFD_2_test.page.hide();
 					PFD_2.page.show();
-					PFD_2.updateFast();
-					updateR = 1;
 				}
 			} else {
+				updateR = 0;
 				PFD_2_test.page.hide();
 				PFD_2.page.hide();
-				updateR = 0;
 			}
 		} else {
+			updateL = 0;
+			updateR = 0;
 			PFD_1_test.page.hide();
 			PFD_1.page.hide();
 			PFD_2_test.page.hide();
 			PFD_2.page.hide();
-			PFD_1_mismatch.page.show();
-			PFD_2_mismatch.page.show();
 			PFD_1_mismatch.update();
 			PFD_2_mismatch.update();
-			updateL = 0;
-			updateR = 0;
+			PFD_1_mismatch.page.show();
+			PFD_2_mismatch.page.show();
 		}
 	},
 	updateSlow: func() {
diff --git a/revision.txt b/revision.txt
index 1b8f5449..1b4cea18 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4616
\ No newline at end of file
+4617
\ No newline at end of file