diff --git a/Models/Instruments/ECAM/page-elec.xml b/Models/Instruments/ECAM/page-elec.xml
index 609c7472..a184f9a5 100644
--- a/Models/Instruments/ECAM/page-elec.xml
+++ b/Models/Instruments/ECAM/page-elec.xml
@@ -24,9 +24,8 @@
 		</layer>
 
 		<layer>
-
 			<type>text</type>
-			<name>BAT1</name>
+			<name>BAT1-voltage</name>
 			<color>
 				<red>0</red>
 				<green>1.0</green>
@@ -37,7 +36,7 @@
 			<chunks>
 				<chunk>
 					<type>number-value</type>
-					<property>/systems/electrical/suppliers/battery</property><!-- There is no TAT temperature property-->
+					<property>/systems/electrical/battery1-volts</property>
 					<format type="string">%3.1f</format>
 				</chunk>
 			</chunks>
@@ -51,12 +50,18 @@
 					<offset>-68	</offset>
 				</transformation>
 			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/battery1</property>
+					<value>1</value>
+				</equals>
+			</condition>
 		</layer>
 		
 		<layer>
 
 			<type>text</type>
-			<name>BAT2</name>
+			<name>BAT2-voltage</name>
 			<color>
 				<red>0</red>
 				<green>1.0</green>
@@ -67,7 +72,7 @@
 			<chunks>
 				<chunk>
 					<type>number-value</type>
-					<property>/systems/electrical/suppliers/battery</property><!-- There is no TAT temperature property-->
+					<property>/systems/electrical/battery2-volts</property>
 					<format type="string">%3.1f</format>
 				</chunk>
 			</chunks>
@@ -81,7 +86,141 @@
 					<offset>38	</offset>
 				</transformation>
 			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/battery2</property>
+					<value>1</value>
+				</equals>
+			</condition>
 		</layer>
+		<layer>
+			<name>battery1off</name>
+			<emissive>true</emissive>
+			<w>42</w>
+			<h>42</h>
+			<texture>
+				<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-bat1off.png</path>
+			</texture>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>102</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>-53	</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/battery1</property>
+					<value>0</value>
+				</equals>
+			</condition>
+		</layer>
+		<layer>
+			<name>battery2off</name>
+			<emissive>true</emissive>
+			<w>42</w>
+			<h>42</h>
+			<texture>
+				<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-bat2off.png</path>
+			</texture>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>102</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>54	</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/battery2</property>
+					<value>0</value>
+				</equals>
+			</condition>
+		</layer>
+		<layer>
+			<type>text</type>
+			<name>BAT1-amps</name>
+			<color>
+				<red>0</red>
+				<green>1.0</green>
+				<blue>0</blue>
+			</color>
+			<font>helvetica_bold</font>
+			<point-size>11</point-size>
+			<chunks>
+				<chunk>
+					<type>number-value</type>
+					<property>/systems/electrical/battery1-amps</property>
+					<format type="string">%3.0f</format>
+				</chunk>
+			</chunks>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>88</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>-68	</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/battery1</property>
+					<value>1</value>
+				</equals>
+			</condition>
+		</layer>
+		
+		<layer>
+
+			<type>text</type>
+			<name>BAT2-amps</name>
+			<color>
+				<red>0</red>
+				<green>1.0</green>
+				<blue>0</blue>
+			</color>
+			<font>helvetica_bold</font>
+			<point-size>11</point-size>
+			<chunks>
+				<chunk>
+					<type>number-value</type>
+					<property>/systems/electrical/battery2-amps</property>
+					<format type="string">%3.0f</format>
+				</chunk>
+			</chunks>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>88</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>38	</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/battery2</property>
+					<value>1</value>
+				</equals>
+			</condition>
+		</layer>
+		
+		
+		
+		
+		
+		
+		
+		
 		
 		<layer>
 
diff --git a/Models/Instruments/ECAM/res/elec-bat1off.png b/Models/Instruments/ECAM/res/elec-bat1off.png
new file mode 100644
index 00000000..4ab1645b
Binary files /dev/null and b/Models/Instruments/ECAM/res/elec-bat1off.png differ
diff --git a/Models/Instruments/ECAM/res/page-elec.png b/Models/Instruments/ECAM/res/page-elec.png
index 40e99480..cf640f70 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 e2de8936..9f30b2ab 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -8,6 +8,8 @@ var ac_volt_std = 115;
 var ac_volt_min = 110;
 var dc_volt_std = 28;
 var dc_volt_min = 25;
+var dc_amps_std = 150;
+var ac_hz_std = 400;
 
 var elec_init = func {
 	setprop("/controls/switches/annun-test", 0);
@@ -24,11 +26,17 @@ var elec_init = func {
 	setprop("/controls/electrical/switches/battery2", 0);
 	setprop("/systems/electrical/battery1-volts", 25.9);
 	setprop("/systems/electrical/battery2-volts", 25.9);
+	setprop("/systems/electrical/battery1-amps", 0);
+	setprop("/systems/electrical/battery2-amps", 0);
 	setprop("/systems/electrical/bus/dc1", 0);
 	setprop("/systems/electrical/bus/dc2", 0);
+	setprop("/systems/electrical/bus/dc1-amps", 0);
+	setprop("/systems/electrical/bus/dc2-amps", 0);
 	setprop("/systems/electrical/bus/dc-ess", 0);
 	setprop("/systems/electrical/bus/ac1", 0);
 	setprop("/systems/electrical/bus/ac2", 0);
+	setprop("/systems/electrical/bus/ac1-hz", 0);
+	setprop("/systems/electrical/bus/ac2-hz", 0);
 	setprop("/systems/electrical/bus/ac-ess", 0);
 	setprop("systems/electrical/on", 0);
 	setprop("/controls/electrical/xtie/xtieL", 0);
@@ -96,6 +104,7 @@ var master_elec = func {
 	var dc_ess = getprop("/systems/electrical/bus/dc-ess");
 	
 	
+	
 	# Left cross tie yes?
 	if (extpwr_on and gen_ext_sw) {
 		setprop("/controls/electrical/xtie/xtieR", 1);
@@ -121,30 +130,35 @@ var master_elec = func {
 	# Left AC/DC bus yes?
 	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/bus/ac-ess", 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/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 (stateL == 3 and gen1_sw) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", 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 (apu_ext_crosstie_sw == 1 and xtieL) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", 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 {
 		setprop("/systems/electrical/bus/ac1", 0);
 		if (getprop("/systems/electrical/bus/ac2") == 0) {
 			setprop("/systems/electrical/bus/ac-ess", 0);
 		}
 		setprop("/systems/electrical/bus/dc1", 0);
+		setprop("/systems/electrical/bus/dc1-amps", 0); 
 		if (getprop("/systems/electrical/bus/dc2") == 0) {
 			setprop("/systems/electrical/bus/dc-ess", 0);
 		}
@@ -156,27 +170,32 @@ var master_elec = func {
 		setprop("/systems/electrical/bus/ac-ess", 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/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 (stateR == 3 and gen2_sw) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", 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 (apu_ext_crosstie_sw == 1  and xtieR) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", 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 {
 		setprop("/systems/electrical/bus/ac2", 0);
 		if (getprop("/systems/electrical/bus/ac1") == 0) {
 			setprop("/systems/electrical/bus/ac-ess", 0);
 		}
 		setprop("/systems/electrical/bus/dc2", 0);
+		setprop("/systems/electrical/bus/dc2-amps", 0); 
 		if (getprop("/systems/electrical/bus/dc1") == 0) {
 			setprop("/systems/electrical/bus/dc-ess", 0);
 		}
@@ -192,6 +211,19 @@ var master_elec = func {
 		setprop("/systems/electrical/bus/galley", 0);
 	}
 	
+	# Battery Amps
+		if (battery1_sw) {
+			setprop("/systems/electrical/battery1-amps", dc_amps_std);
+		} else {
+			setprop("/systems/electrical/battery1-amps", 0);
+		}
+		
+		if (battery2_sw) {
+			setprop("/systems/electrical/battery2-amps", dc_amps_std);
+		} else {
+			setprop("/systems/electrical/battery2-amps", 0);
+		}
+	
 	if (getprop("/systems/electrical/bus/ac-ess") == 0) {
 		setprop("systems/electrical/on", 0);
 #		ai_spin.setValue(0.2);