diff --git a/apps/powermanager/boot.js b/apps/powermanager/boot.js
index c35ec1546d..18e69e0773 100644
--- a/apps/powermanager/boot.js
+++ b/apps/powermanager/boot.js
@@ -3,7 +3,7 @@
     require('Storage').readJSON("powermanager.default.json", true) || {},
     require('Storage').readJSON("powermanager.json", true) || {}
   );
-
+  
   if (settings.log) {
     let logFile = require('Storage').open("powermanager.log","a");
     let def = require('Storage').readJSON("powermanager.def.json", true) || {};
@@ -12,7 +12,7 @@
     let hw = require('Storage').readJSON("powermanager.hw.json", true) || {};
     if (!hw.start) hw.start = Date.now();
     if (!hw.power) hw.power = {};
-
+    
     const saveEvery = 1000 * 60 * 5;
     const TO_WRAP = ["GPS","Compass","Barometer","HRM","LCD"];
 
@@ -28,7 +28,9 @@
         require('Storage').writeJSON("powermanager.hw.json", hw);
       }
     }
-
+    
+    
+    
     setInterval(save, saveEvery);
 
     E.on("kill", ()=>{
@@ -75,7 +77,7 @@
       })(Bangle[functionName]);
     }
 
-    let functions = {};
+
     let wrapDeferred = ((o,t) => (a) => {
       if (a == eval || typeof a == "string") {
         return o.apply(this, arguments);
@@ -131,15 +133,30 @@
     handleCharging(Bangle.isCharging());
   }
 
+  var savedBatPercent=E.getBattery();
   if (settings.forceMonoPercentage){
-    var p = (E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery())/4;
-    var op = E.getBattery;
+    var newPercent =Math.round((E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery())/6);
+    
     E.getBattery = function() {
-      var current = Math.round((op()+op()+op()+op())/4);
-      if (Bangle.isCharging() && current > p) p = current;
-      if (!Bangle.isCharging() && current < p) p = current;
-      return p;
-    };
+      var percentToReturn;
+      if(Bangle.isCharging()){
+        //only go up
+        if(newPercent>savedBatPercent){
+          percentToReturn=newPercent;
+          savedBatPercent=newPercent;
+        }else{
+          percentToReturn=savedBatPercent;
+        }
+      }else{
+        if(newPercent<savedBatPercent){
+          percentToReturn=newPercent;
+          savedBatPercent=newPercent;
+        }else{
+          percentToReturn=savedBatPercent;
+        }
+      }
+      return percentToReturn;
+  };
   }
   
   if (settings.forceMonoVoltage){