diff --git a/apps/cliclockJS2Enhanced b/apps/cliclockJS2Enhanced
new file mode 100644
index 000000000..9cc0ab87c
--- /dev/null
+++ b/apps/cliclockJS2Enhanced
@@ -0,0 +1,217 @@
+var fontsize = g.getWidth()>200 ? 3 : 2;
+var fontsizeTime = g.getWidth()>200 ? 4 : 4;
+
+var fontheight = 10*fontsize;
+var fontheightTime = 10*fontsizeTime;
+var locale = require("locale");
+var marginTop = 40;
+var flag = false;
+
+var hrtOn = false;
+var hrtStr = "Hrt: ??? bpm";
+
+const NONE_MODE = "none";
+const ID_MODE = "id";
+const VER_MODE = "ver";
+const BATT_MODE = "batt";
+const MEM_MODE = "mem";
+const STEPS_MODE = "step";
+const HRT_MODE = "hrt";
+const NONE_FN_MODE = "no_fn";
+const HRT_FN_MODE = "fn_hrt";
+
+let infoMode = NONE_MODE;
+let functionMode = NONE_FN_MODE;
+
+let textCol = g.theme.dark ? "#0f0" : "#080";
+
+function drawAll(){
+  updateTime();
+  updateRest(new Date());
+}
+
+function updateRest(now){
+  writeLine(locale.dow(now),1);
+  writeLine(locale.date(now,1),2);
+  drawInfo(5);
+}
+function updateTime(){
+  if (!Bangle.isLCDOn()) return;
+  let now = new Date();
+  writeLine(locale.time(now,1),0);
+  writeLine(flag?" ":"_",3);
+  flag = !flag;
+  if(now.getMinutes() == 0)
+    updateRest(now);
+}
+function writeLineStart(line){
+  if (line==0){
+      g.drawString(">",0,marginTop+(line)*fontheight);
+  } else {
+      g.drawString(">",4,marginTop+(line-1)*fontheight + fontheightTime);
+
+  }
+}
+
+function writeLine(str,line){
+  if (line == 0){
+  var y = marginTop+line*fontheightTime;
+  g.setFont("6x8",fontsizeTime);
+  g.setColor(textCol).setFontAlign(-1,-1);
+  g.clearRect(0,y,((str.length+1)*20),y+fontheight-1);
+  writeLineStart(line);
+  g.drawString(str,25,y);
+  } else {
+      var y = marginTop+(line-1)*fontheight+fontheightTime;
+  g.setFont("6x8",fontsize);
+  g.setColor(textCol).setFontAlign(-1,-1);
+  g.clearRect(0,y,((str.length+1)*20),y+fontheight-1);
+  writeLineStart(line);
+  g.drawString(str,25,y);
+  }
+
+}
+
+function drawInfo(line) {
+  let val;
+  let str = "";
+  let col = textCol; // green
+
+  //console.log("drawInfo(), infoMode=" + infoMode + " funcMode=" + functionMode);
+
+  switch(functionMode) {
+  case NONE_FN_MODE:
+    break;
+  case HRT_FN_MODE:
+    col = g.theme.dark ? "#0ff": "#088"; // cyan
+    str = "HRM: " + (hrtOn ? "ON" : "OFF");
+    drawModeLine(line,str,col);
+    return;
+  }
+
+  switch(infoMode) {
+  case NONE_MODE:
+    col = g.theme.bg;
+    str = "";
+    break;
+  case HRT_MODE:
+    str = hrtStr;
+    break;
+  case STEPS_MODE:
+    str = "Steps: " + stepsWidget().getSteps();
+    break;
+  case ID_MODE:
+    val = NRF.getAddress().split(":");
+    str = "Id: " + val[4] + val[5];
+    break;
+  case VER_MODE:
+    str = "Fw: " + process.env.VERSION;
+    break;
+  case MEM_MODE:
+    val = process.memory();
+    str = "Memory: " + Math.round(val.usage*100/val.total) + "%";
+    break;
+  case BATT_MODE:
+  default:
+    str = "Battery: " + E.getBattery() + "%";
+  }
+
+  drawModeLine(line,str,col);
+}
+
+function drawModeLine(line, str, col) {
+  g.setColor(col);
+  var y = marginTop+line*fontheight;
+  g.fillRect(0, y, 239, y+fontheight-1);
+  g.setColor(g.theme.bg).setFontAlign(0, 0);
+  g.drawString(str, g.getWidth()/2, y+fontheight/2);
+}
+
+function changeInfoMode() {
+  switch(functionMode) {
+  case NONE_FN_MODE:
+    break;
+  case HRT_FN_MODE:
+    hrtOn = !hrtOn;
+    Bangle.buzz();
+    Bangle.setHRMPower(hrtOn ? 1 : 0);
+    if (hrtOn) infoMode = HRT_MODE;
+    return;
+  }
+
+  switch(infoMode) {
+  case NONE_MODE:
+    if (stepsWidget() !== undefined)
+      infoMode = hrtOn ? HRT_MODE : STEPS_MODE;
+    else
+      infoMode = VER_MODE;
+    break;
+  case HRT_MODE:
+    if (stepsWidget() !== undefined)
+      infoMode = STEPS_MODE;
+    else
+      infoMode = VER_MODE;
+    break;
+  case STEPS_MODE:
+    infoMode = ID_MODE;
+    break;
+  case ID_MODE:
+    infoMode = VER_MODE;
+    break;
+  case VER_MODE:
+    infoMode = BATT_MODE;
+    break;
+  case BATT_MODE:
+    infoMode = MEM_MODE;
+    break;
+  case MEM_MODE:
+  default:
+    infoMode = NONE_MODE;
+  }
+}
+
+function changeFunctionMode() {
+  //console.log("changeFunctionMode()");
+  switch(functionMode) {
+  case NONE_FN_MODE:
+    functionMode = HRT_FN_MODE;
+    break;
+  case HRT_FN_MODE:
+  default:
+    functionMode = NONE_FN_MODE;
+  }
+  //console.log(functionMode);
+
+}
+
+function stepsWidget() {
+  if (WIDGETS.activepedom !== undefined) {
+    return WIDGETS.activepedom;
+  } else if (WIDGETS.wpedom !== undefined) {
+    return WIDGETS.wpedom;
+  }
+  return undefined;
+}
+
+Bangle.on('HRM', function(hrm) {
+  if(hrm.confidence > 90){
+    hrtStr = "Hrt: " + hrm.bpm + " bpm";
+  } else {
+    hrtStr = "Hrt: ??? bpm";
+  }
+});
+
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+drawAll();
+Bangle.on('lcdPower',function(on) {
+  if (on) drawAll();
+});
+var click = setInterval(updateTime, 1000);
+// Show launcher when button pressed
+Bangle.setUI("clockupdown", btn=>{
+  if (btn<0) changeInfoMode();
+  if (btn>0) changeFunctionMode();
+  drawAll();
+});