diff --git a/MainCode/adalm1000_logger.py b/MainCode/adalm1000_logger.py
index 7f33d13..ba8abd7 100644
--- a/MainCode/adalm1000_logger.py
+++ b/MainCode/adalm1000_logger.py
@@ -506,10 +506,8 @@ class BatteryTester:
                 time_elapsed = time.time() - self.last_update_time
                 
                 # Update charge capacity
-                now = time.time()
-                delta_t = now - self.last_update_time
-                self.last_update_time = now
-                self.charge_capacity.set(self.charge_capacity.get() + measured_current * delta_t / 3600)
+                self.charge_capacity.set(self.charge_capacity.get() + measured_current * time_elapsed / 3600)
+                self.last_update_time = time.time()
                 
                 self.status_var.set(
                     f"Charging: {current_voltage:.3f}V / {target_voltage}V | "
@@ -564,10 +562,8 @@ class BatteryTester:
                 current_current = abs(self.current_data[-1])
                 
                 # Calculate discharged capacity
-                now = time.time()
-                delta_t = now - self.last_update_time
-                self.last_update_time = now
-                self.charge_ah.set(self.charge_ah.get() + current_current * delta_t / 3600)
+                self.capacity_ah.set(self.capacity_ah.get() + current_current * (time.time() - self.last_update_time) / 3600)
+                self.last_update_time = time.time()
                 
                 self.status_var.set(
                     f"Discharging: {current_voltage:.3f}V / {self.discharge_cutoff.get()}V | "