diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index 44d1989..4a479bb 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -366,7 +366,7 @@ var Cable = {
     }
 };
 
-var cSource = CurrentSource.new(0.0136, 760, kWh2kWs(100), "Battery");#//Battery for engine, 100kWh, 760V
+var cSource = CurrentSource.new(0.0136, 760, kWh2kWs(80), "Battery");#//Battery for engine, 80kWh, 760V
 var circuit_1 = Circuit.new(cSource);#//Engine circuit
 
 var cSource_small = CurrentSource.new(0.0136, 12, kWh2kWs(0.72), "Battery");#//Battery for other systems, 60Ah, 12V
diff --git a/Nasal/systems.nas b/Nasal/systems.nas
index 7a00378..f52ee04 100644
--- a/Nasal/systems.nas
+++ b/Nasal/systems.nas
@@ -305,10 +305,12 @@ var indicatorController = IndicatorController.new();
 var chargeBatterySec = func(){
     #//var battery = props.getNode("/systems/electrical/e-tron/battery-kWs");
     #//var currentBattery = battery.getValue();
-    var batteryRemaining = circuit_1.parallelConnection[0].units[0].remaining;
-    if(batteryRemaining >= 288000){
+    var battery = circuit_1.parallelConnection[0].units[0];
+    var batteryRemaining = battery.remaining;
+    var batteryElecForce = battery.ratedElectromotiveForce;
+    if(batteryRemaining >= battery.electricalCapacity){
         screen.log.write("Battery is Successfully recharged!", 0, 0.584, 1);
-        chargeBatteryStop();
+        chargeBatteryStop(batteryElecForce);
     }
     #//battery.setValue(currentBattery+240);
     #//batteryRemaining += 240;