diff --git a/docs/examples.md b/docs/examples.md
index c9a5a255..c19908c7 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -53,11 +53,6 @@ Here are some fun programs for your @boardname@!
   "description": "Chart analog input on the LED screen",
   "url": "/examples/plot-analog-pin",
   "cardType": "example"
-}, {
-  "name": "Stop Watch",
-  "description": "Easily track time",
-  "url": "/examples/stop-watch",
-  "cardType": "example"
 }, {
   "name": "Radio Dashboard",
   "description": "A dashboard for radio clients",
diff --git a/docs/examples/stop-watch.md b/docs/examples/stop-watch.md
deleted file mode 100644
index 38fa74fe..00000000
--- a/docs/examples/stop-watch.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Stop watch
-
-Press ``A`` to start the counter. Press ``A`` again to stop and display the duration. 
-
-```blocks
-let sec = 0
-let start = 0
-input.onButtonPressed(Button.A, function () {
-    if (!(start)) {
-        start = input.runningTime()
-        basic.showIcon(IconNames.Butterfly)
-    } else {
-        sec = input.runningTime() - start / 1000
-        start = 0
-        basic.clearScreen()
-        basic.showNumber(sec)
-    }
-})
-start = 0
-```
diff --git a/docs/projects/fashion.md b/docs/projects/fashion.md
index 69687c2a..e36ca609 100644
--- a/docs/projects/fashion.md
+++ b/docs/projects/fashion.md
@@ -11,6 +11,11 @@
   "name": "Watch",
   "url":"/projects/watch",
   "imageUrl":"/static/mb/projects/a10-watch.png"
+}, {
+  "name": "Stop Watch",
+  "description": "Easily track time",
+  "url": "/projects/stop-watch",
+  "imageUrl":"/static/mb/projects/stop-watch.png"
 }]
 ```
 
diff --git a/docs/projects/stop-watch.md b/docs/projects/stop-watch.md
new file mode 100644
index 00000000..239302d3
--- /dev/null
+++ b/docs/projects/stop-watch.md
@@ -0,0 +1,54 @@
+# Stop watch
+
+![A @boardname@ stop watch toon image](/static/mb/projects/stop-watch.png)
+
+This project turns the @boardname@ into a simple stop-watch. You can use it the [Watch project]
+if you've build it already. Pressing **A** will start the timer
+and pressing **A** again will display the resulting time. Let's get started.
+
+## Program state
+
+The stop watch has two states: it is either stopped or measuring time. 
+Let's create a new variable ``start_time`` to track the state:
+* if ``start_time`` is equal to ``0``, the watch is stopped.
+* if ``start_time`` is **not** equal to ``0``, the watch is running and the value of ``start_time`` is
+the time it started.
+
+## Pseudo code
+
+The rough outline of the code is as follows: when a user presses **A**, we start by determining in which
+state we are. If the watch is stopped (``start time`` is 0), we start the counter and store the current time. If the watch is running (``start time`` is not 0), we compute the duration and reset ``start time`` to 0.
+
+The ``||input:runningTime||`` block returns the number of **milli**-seconds elapsed since the @boardname@ was turned on. To compute the duration in seconds, we use the following formula:
+
+    duration in seconds = (current time - start time) / 1000.0
+
+In pseudo code, this could look like this:
+```
+on button pressed
+    if start time is 0
+        store current time into start time      
+    else
+        show duration
+        reset start time
+``` 
+
+If you translate the pseudo-code line by line into blocks, it might end up like this.
+
+```blocks
+let start_time = 0
+input.onButtonPressed(Button.A, function () {
+    // is the watch running?
+    if (start_time == 0) {
+        // store current time
+        start_time = input.runningTime()
+        basic.showIcon(IconNames.Butterfly)
+    } else {
+        // compute duration and display it
+        basic.showNumber(Math.idiv(input.runningTime() - start_time, 1000))
+        // reset watch state
+        start_time = 0
+    }
+})
+start_time = 0
+```
diff --git a/docs/static/mb/projects/stop-watch.png b/docs/static/mb/projects/stop-watch.png
new file mode 100644
index 00000000..08f4dfd7
Binary files /dev/null and b/docs/static/mb/projects/stop-watch.png differ