diff --git a/Models/Instruments/ECAM/page-apu.xml b/Models/Instruments/ECAM/page-apu.xml
index 40a7cce4..351f5aac 100644
--- a/Models/Instruments/ECAM/page-apu.xml
+++ b/Models/Instruments/ECAM/page-apu.xml
@@ -159,7 +159,7 @@
 			<chunks>
 				<chunk>
 					<type>number-value</type>
-					<property>/systems/electrical/suppliers/apu-v</property>
+					<property>/systems/electrical/extra/apu-volts</property>
 					<format type="string">%3.0f</format>
 				</chunk>
 			</chunks>
@@ -170,7 +170,7 @@
 				</transformation>
 				<transformation>
 					<type>x-shift</type>
-					<offset>-80</offset>
+					<offset>-84</offset>
 				</transformation>
 			</transformations>
 		</layer>
diff --git a/Models/Instruments/ECAM/page-elec.xml b/Models/Instruments/ECAM/page-elec.xml
index a184f9a5..05aad23b 100644
--- a/Models/Instruments/ECAM/page-elec.xml
+++ b/Models/Instruments/ECAM/page-elec.xml
@@ -213,19 +213,10 @@
 				</equals>
 			</condition>
 		</layer>
-		
-		
-		
-		
-		
-		
-		
-		
-		
 		<layer>
 
 			<type>text</type>
-			<name>GEN1</name>
+			<name>GEN1-volts</name>
 			<color>
 				<red>0</red>
 				<green>1.0</green>
@@ -236,7 +227,7 @@
 			<chunks>
 				<chunk>
 					<type>number-value</type>
-					<property>/systems/electrical/suppliers/gen1-v</property><!-- There is no TAT temperature property-->
+					<property>/systems/electrical/bus/ac1</property>
 					<format type="string">%3.0f</format>
 				</chunk>
 			</chunks>
@@ -247,15 +238,21 @@
 				</transformation>
 				<transformation>
 					<type>x-shift</type>
-					<offset>-116</offset>
+					<offset>-117</offset>
 				</transformation>
 			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/gen1</property>
+					<value>1</value>
+				</equals>
+			</condition>
 		</layer>
 		
 		<layer>
 
 			<type>text</type>
-			<name>GEN2</name>
+			<name>GEN2-volts</name>
 			<color>
 				<red>0</red>
 				<green>1.0</green>
@@ -266,7 +263,7 @@
 			<chunks>
 				<chunk>
 					<type>number-value</type>
-					<property>/systems/electrical/suppliers/gen2-v</property><!-- There is no TAT temperature property-->
+					<property>/systems/electrical/bus/ac2</property>
 					<format type="string">%3.0f</format>
 				</chunk>
 			</chunks>
@@ -277,13 +274,17 @@
 				</transformation>
 				<transformation>
 					<type>x-shift</type>
-					<offset>92</offset>
+					<offset>91</offset>
 				</transformation>
 			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/gen2</property>
+					<value>1</value>
+				</equals>
+			</condition>
 		</layer>
-		
 		<layer>
-
 			<type>text</type>
 			<name>APU-V</name>
 			<color>
@@ -296,7 +297,7 @@
 			<chunks>
 				<chunk>
 					<type>number-value</type>
-					<property>/systems/electrical/suppliers/apu-v</property><!-- There is no TAT temperature property-->
+					<property>/systems/electrical/extra/apu-volts</property>
 					<format type="string">%3.0f</format>
 				</chunk>
 			</chunks>
@@ -310,6 +311,12 @@
 					<offset>-24</offset>
 				</transformation>
 			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/gen-apu</property>
+					<value>1</value>
+				</equals>
+			</condition>
 		</layer>
 		
 		<layer>
@@ -326,7 +333,7 @@
 			<chunks>
 				<chunk>
 					<type>number-value</type>
-					<property>/systems/electrical/suppliers/ext-power-v</property><!-- There is no TAT temperature property-->
+					<property>/systems/electrical/extra/ext-volts</property><!-- There is no TAT temperature property-->
 					<format type="string">%3.0f</format>
 				</chunk>
 			</chunks>
@@ -341,6 +348,64 @@
 				</transformation>
 			</transformations>
 		</layer>
+		<layer>
+			<name>apugen</name>
+			<emissive>true</emissive>
+			<w>42</w>
+			<h>42</h>
+			<texture>
+				<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-apu-gen-off.png</path>
+			</texture>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>-53</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>-11</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<and>
+					<equals>
+						<property>/controls/electrical/switches/gen-apu</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/controls/APU/master</property>
+						<value>1</value>
+					</equals>
+				</and>
+			</condition>
+		</layer>
+		<layer>
+			<name>apugenno</name>
+			<emissive>true</emissive>
+			<w>42</w>
+			<h>42</h>
+			<texture>
+				<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-apu-gen-no.png</path>
+			</texture>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>-53</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>-11</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<and>
+					<equals>
+						<property>/controls/APU/master</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+		</layer>
 		
 <!-- ################################## Bottom  #################################-->
 
diff --git a/Models/Instruments/ECAM/res/elec-apu-gen-no.png b/Models/Instruments/ECAM/res/elec-apu-gen-no.png
new file mode 100644
index 00000000..a3896e72
Binary files /dev/null and b/Models/Instruments/ECAM/res/elec-apu-gen-no.png differ
diff --git a/Models/Instruments/ECAM/res/elec-apu-gen-off.png b/Models/Instruments/ECAM/res/elec-apu-gen-off.png
index 9b51f079..8392bbb2 100644
Binary files a/Models/Instruments/ECAM/res/elec-apu-gen-off.png and b/Models/Instruments/ECAM/res/elec-apu-gen-off.png differ
diff --git a/Models/Instruments/ECAM/res/elec-apu-gen.png b/Models/Instruments/ECAM/res/elec-apu-gen.png
deleted file mode 100644
index 757104df..00000000
Binary files a/Models/Instruments/ECAM/res/elec-apu-gen.png and /dev/null differ
diff --git a/Models/Instruments/ECAM/res/page-elec.png b/Models/Instruments/ECAM/res/page-elec.png
index cf640f70..ad0ed4ba 100644
Binary files a/Models/Instruments/ECAM/res/page-elec.png and b/Models/Instruments/ECAM/res/page-elec.png differ
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index 9f30b2ab..ac4f597a 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -38,6 +38,8 @@ var elec_init = func {
 	setprop("/systems/electrical/bus/ac1-hz", 0);
 	setprop("/systems/electrical/bus/ac2-hz", 0);
 	setprop("/systems/electrical/bus/ac-ess", 0);
+	setprop("/systems/electrical/extra/ext-volts", 0);
+	setprop("/systems/electrical/extra/apu-volts", 0);
 	setprop("systems/electrical/on", 0);
 	setprop("/controls/electrical/xtie/xtieL", 0);
 	setprop("/controls/electrical/xtie/xtieR", 0);
@@ -131,12 +133,14 @@ var master_elec = func {
 	if (extpwr_on and gen_ext_sw) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", ac_volt_std); 
+		setprop("/systems/electrical/extra/ext-volts", ac_volt_std);
 		setprop("/systems/electrical/bus/dc1", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); 
 	} else if (rpmapu >= 94.9 and gen_apu_sw) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+		setprop("/systems/electrical/extra/apu-volts", ac_volt_std);
 		setprop("/systems/electrical/bus/dc1", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); 
@@ -154,6 +158,8 @@ var master_elec = func {
 		setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); 
 	} else {
 		setprop("/systems/electrical/bus/ac1", 0);
+		setprop("/systems/electrical/extra/ext-volts", 0);
+		setprop("/systems/electrical/extra/apu-volts", 0);
 		if (getprop("/systems/electrical/bus/ac2") == 0) {
 			setprop("/systems/electrical/bus/ac-ess", 0);
 		}
@@ -168,12 +174,14 @@ var master_elec = func {
 	if (extpwr_on and gen_ext_sw) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+		setprop("/systems/electrical/extra/ext-volts", ac_volt_std);
 		setprop("/systems/electrical/bus/dc2", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); 
 	} else if (rpmapu >= 94.9 and gen_apu_sw) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+		setprop("/systems/electrical/extra/apu-volts", ac_volt_std);
 		setprop("/systems/electrical/bus/dc2", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); 
@@ -191,6 +199,8 @@ var master_elec = func {
 		setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); 
 	} else {
 		setprop("/systems/electrical/bus/ac2", 0);
+		setprop("/systems/electrical/extra/ext-volts", 0);
+		setprop("/systems/electrical/extra/apu-volts", 0);
 		if (getprop("/systems/electrical/bus/ac1") == 0) {
 			setprop("/systems/electrical/bus/ac-ess", 0);
 		}