diff --git a/apps/hrm/ChangeLog b/apps/hrm/ChangeLog
index 9b390b63e..4a01008ac 100644
--- a/apps/hrm/ChangeLog
+++ b/apps/hrm/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Update for new firmwares that have a 'HRM-raw' event
 0.05: Tweaks for 'HRM-raw' handling
 0.06: Add widgets
+0.07: Update scaling for new firmware
diff --git a/apps/hrm/heartrate.js b/apps/hrm/heartrate.js
index a47251010..2e6a34985 100644
--- a/apps/hrm/heartrate.js
+++ b/apps/hrm/heartrate.js
@@ -38,9 +38,12 @@ function onHRM(h) {
   g.drawString("BPM",px+15,45);
 }
 Bangle.on('HRM', onHRM);
+
+var MID = (g.getHeight()+80)/2;
 /* On newer (2v10) firmwares we can subscribe to get
 HRM events as they happen */
 Bangle.on('HRM-raw', function(v) {
+  h=v;
   hrmOffset++;
   if (hrmOffset>g.getWidth()) {
     hrmOffset=0;
@@ -48,9 +51,9 @@ Bangle.on('HRM-raw', function(v) {
     lastHrmPt = [-100,0];
   }
 
-  y = E.clip(btm-v.filt/4,btm-10,btm);
+  y = E.clip(btm-(8+v.filt/2000),btm-16,btm);
   g.setColor(1,0,0).fillRect(hrmOffset,btm, hrmOffset, y);
-  y = E.clip(170 - (v.raw/2),80,btm);
+  y = E.clip(btm - (v.raw/45),84,btm);
   g.setColor(g.theme.fg).drawLine(lastHrmPt[0],lastHrmPt[1],hrmOffset, y);
   lastHrmPt = [hrmOffset, y];
   if (counter !==undefined) {
@@ -95,3 +98,4 @@ function readHRM() {
     lastHrmPt = [hrmOffset, y];
   }
 }
+
diff --git a/apps/hrm/metadata.json b/apps/hrm/metadata.json
index 1504253bd..027e75d67 100644
--- a/apps/hrm/metadata.json
+++ b/apps/hrm/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "hrm",
   "name": "Heart Rate Monitor",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Measure your heart rate and see live sensor data",
   "icon": "heartrate.png",
   "tags": "health",