diff --git a/ESP32/TempHumLoggerHomeKit/TempHumLoggerHomeKit.ino b/ESP32/TempHumLoggerHomeKit/TempHumLoggerHomeKit.ino
index d3495ee..7e30e9b 100644
--- a/ESP32/TempHumLoggerHomeKit/TempHumLoggerHomeKit.ino
+++ b/ESP32/TempHumLoggerHomeKit/TempHumLoggerHomeKit.ino
@@ -9,7 +9,7 @@
 #include "SD.h"
 #include "SPI.h"
 
-#define Version "0.33"
+#define Version "0.35"
 #define WIRE Wire
 #define DHTTYPE DHT22
 #define DHTPIN 4
@@ -444,7 +444,7 @@ void loop() {
     display.setCursor(80,8); 
     display.print("V:");
     display.setCursor(95, 8);
-    display.print(formatNumber(batteryVoltage,2));
+    display.print(batteryVoltage);
 
     display.setCursor(0, 24);
     if (currentBatteryVoltage >= 4.20 ){
@@ -453,19 +453,17 @@ void loop() {
     } else if ((lastBatteryVoltage < currentBatteryVoltage && currentBatteryVoltage >= 2.0&& currentBatteryVoltage >= 4.0  ) || currentBatteryVoltage >= 4.10  ){
         display.print("Charging");
         chrgState = "CHR";
-    } else if (lastBatteryVoltage > currentBatteryVoltage && currentBatteryVoltage >= 2.0 ) {
+    } else if (lastBatteryVoltage >=currentBatteryVoltage && currentBatteryVoltage >= 2.0 ) {
         display.print("Discharge");
         chrgState = "DSG";
     } else {
         display.print("---");
         chrgState = "---";
     }
-    if (chrgState == "DSG"){
-      batteryPercent = voltageToPercentage(currentBatteryVoltage);
-    } else if (chrgState == "CHR") {
-            batteryPercent = chargeVoltageToPercentage(currentBatteryVoltage);
+    if (chrgState == "CHR") {
+        batteryPercent = chargeVoltageToPercentage(currentBatteryVoltage);
     } else {
-      batteryPercent = 100;
+        batteryPercent = voltageToPercentage(currentBatteryVoltage);
     }
       
     
@@ -582,7 +580,7 @@ void loop() {
             file.print(" Battery %:  ");
             file.print(batteryPercent);
             file.print(" V:  ");
-            file.println(currentBatteryVoltage);
+            file.println(formatNumber(currentBatteryVoltage,2));
             file.close();
          }
      }