diff --git a/apps.json b/apps.json
index c3b86f15a..4f790bc25 100644
--- a/apps.json
+++ b/apps.json
@@ -551,8 +551,8 @@
   {
     "id": "cubescramble",
     "name": "Cube Scramble",
-    "version":"0.03",
-    "description": "A random scramble generator for the 3x3 Rubik's cube",
+    "version":"0.04",
+    "description": "A random scramble generator for the 3x3 Rubik's cube with a basic timer",
     "icon": "cube-scramble.png",
     "tags": "",
     "supports" : ["BANGLEJS","BANGLEJS2"],
diff --git a/apps/cubescramble/ChangeLog b/apps/cubescramble/ChangeLog
index 6de5b7211..46852864a 100644
--- a/apps/cubescramble/ChangeLog
+++ b/apps/cubescramble/ChangeLog
@@ -1,3 +1,4 @@
 0.01: Initial Release
 0.02: Replace icon with one found on https://icons8.com
 0.03: Re-render icon fixing display in settings
+0.04: Improved UX and display solve time
diff --git a/apps/cubescramble/README.md b/apps/cubescramble/README.md
index 779e32489..1c1603372 100644
--- a/apps/cubescramble/README.md
+++ b/apps/cubescramble/README.md
@@ -1,12 +1,11 @@
 # Cube Scramble
 
-A random scramble generator for the 3x3 Rubik's cube
+A random scramble generator for the 3x3 Rubik's cube with a basic timer.
 
 ## Future features
 
 I'm keen to complete this project with
 
-* Add a timer
 * Add the ability for times to be stored and exported
 
 ## Requests
diff --git a/apps/cubescramble/bangle1-cube-scramble-screenshot.png b/apps/cubescramble/bangle1-cube-scramble-screenshot.png
index d75a60e81..5a35238e3 100644
Binary files a/apps/cubescramble/bangle1-cube-scramble-screenshot.png and b/apps/cubescramble/bangle1-cube-scramble-screenshot.png differ
diff --git a/apps/cubescramble/bangle2-cube-scramble-screenshot.png b/apps/cubescramble/bangle2-cube-scramble-screenshot.png
index b54be04b8..ae37b4aff 100644
Binary files a/apps/cubescramble/bangle2-cube-scramble-screenshot.png and b/apps/cubescramble/bangle2-cube-scramble-screenshot.png differ
diff --git a/apps/cubescramble/cube-scramble.js b/apps/cubescramble/cube-scramble.js
index c0b1d11c3..73c4e95ef 100644
--- a/apps/cubescramble/cube-scramble.js
+++ b/apps/cubescramble/cube-scramble.js
@@ -1,4 +1,3 @@
-
 // Scramble code from: https://raw.githubusercontent.com/bjcarlson42/blog-post-sample-code/master/Rubik's%20Cube%20JavaScript%20Scrambler/part_two.js
 const makeScramble = () => {
   const options = ["F", "F2", "F'", "R", "R2", "R'", "U", "U2", "U'", "B", "B2", "B'", "L", "L2", "L'", "D", "D2", "D'"];
@@ -59,16 +58,36 @@ const getRandomInt = max => Math.floor(Math.random() * Math.floor(max)); // retu
 const getRandomIntBetween = (min, max) => Math.floor(Math.random() * (max - min) + min);
 
 const presentScramble = () => {
-  g.clear();
-  E.showMessage(makeScramble().join(" "));
+  showPrompt(makeScramble().join(" "), {
+    buttons: {"solve": true, "reset": false}
+  }).then((v) => {
+    if (v) {
+      const start = new Date();
+      showPrompt(" ", {
+        buttons: {"stop": true}
+      }).then(() => {
+        const time = parseFloat(((new Date()).getTime() - start.getTime()) / 1000);
+        showPrompt(String(time.toFixed(3)), {
+          buttons: {"next": true}
+        }).then(() => {
+          presentScramble();
+        });
+      });
+    } else {
+      presentScramble();
+    }
+  });
+};
+
+const showPrompt = (text, options = {}) => {
+  options.title = options.title || "cube scramble";
+  return E.showPrompt(text, options);
 };
 
 const init = () => {
+  Bangle.setLCDTimeout(0);
+  Bangle.setLCDPower(1);
   presentScramble();
-
-  setWatch(() => {
-    presentScramble();
-  }, BTN1, {repeat:true});
 };
 
 init();