diff --git a/package-lock.json b/package-lock.json
index 6c41deb..6c56c5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,13 @@
 {
   "name": "digitaljs_online",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "3vl": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/3vl/-/3vl-0.2.2.tgz",
-      "integrity": "sha512-MKYgcxAkujnQ8vbuOqbdg5wq8GMHMwIQS1gmHuw9hKsMARYE9xXwPX03rO6EkLb3SbjRkcq9ib+J5aE9LO6alQ=="
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/3vl/-/3vl-0.2.3.tgz",
+      "integrity": "sha512-MJZeMVt3PGlxtgioeMq/oi4sH08W9Oitj0ZAnrFY+tRwojk30NzMcqC+STtgN7uN8pKWzqtYWn2KUNF16QJbxg=="
     },
     "@babel/code-frame": {
       "version": "7.5.5",
@@ -825,9 +825,9 @@
       }
     },
     "big-integer": {
-      "version": "1.6.44",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz",
-      "integrity": "sha512-7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ=="
+      "version": "1.6.45",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.45.tgz",
+      "integrity": "sha512-nmb9E7oEtVJ7SmSCH/DeJobXyuRmaofkpoQSimMFu3HKJ5MADtM825SPLhDuWhZ6TElLAQtgJbQmBZuHIRlZoA=="
     },
     "big.js": {
       "version": "5.2.2",
@@ -2037,13 +2037,13 @@
       }
     },
     "digitaljs": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/digitaljs/-/digitaljs-0.5.1.tgz",
-      "integrity": "sha512-Nb/VJVx7Lx8UEdJ9VoaoWlqgp6zP+YgS7Mkr+r3qXB1TsK9xAE/Qnj7qtMmGQqy+EW+t4hkfQOO//Hcykx+ymw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/digitaljs/-/digitaljs-0.5.2.tgz",
+      "integrity": "sha512-zarb2TrVWu+akIyyHy4QaUcfMOBiYm0prMV9jV/jbmamPfJlLZE/bZjmujG5ZAwPIX9brWe3OxELPJKiADEP5g==",
       "requires": {
-        "3vl": "0.2.2",
+        "3vl": "0.2.3",
         "babel-polyfill": "6.26.0",
-        "big-integer": "1.6.44",
+        "big-integer": "1.6.45",
         "css-element-queries": "1.2.1",
         "dagre": "0.8.4",
         "fastpriorityqueue": "0.6.3",
@@ -2051,7 +2051,7 @@
         "jointjs": "3.0.4",
         "jquery": "3.4.1",
         "jquery-ui": "1.12.1",
-        "wavecanvas": "0.1.1"
+        "wavecanvas": "0.1.2"
       }
     },
     "dir-glob": {
@@ -7984,11 +7984,11 @@
       }
     },
     "wavecanvas": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/wavecanvas/-/wavecanvas-0.1.1.tgz",
-      "integrity": "sha512-ZOqsl4yC5nhRLdwPM5YXKu93i0ggANOH5m6J/Rg492ssPr0k2pC3t0uOpOMXRZeRcY7lhPYUpDcvbhh4ncECLw==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/wavecanvas/-/wavecanvas-0.1.2.tgz",
+      "integrity": "sha512-4baXbRKYEzWANwfTt8T0xAtALgdiV/p9xnAEh8v1O7LFnC3I9JfF/NABGDEC2+xz2zXrymWE2W7c/IoPTlEx5Q==",
       "requires": {
-        "3vl": "0.2.2"
+        "3vl": "0.2.3"
       }
     },
     "wbuf": {
@@ -8479,12 +8479,12 @@
       }
     },
     "yosys2digitaljs": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/yosys2digitaljs/-/yosys2digitaljs-0.1.6.tgz",
-      "integrity": "sha512-+Qiy6KhUk2iWQGOGnURy86DtyJHA/f6uOK4QMQinLBjjRF8EIuBM6/11k9Nyjk7Vx+TMC8RWAqqwcdTR6nFRyw==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/yosys2digitaljs/-/yosys2digitaljs-0.1.7.tgz",
+      "integrity": "sha512-TEmEeheFB5/JqYpfa8Qh5E4RgFLRi2wm/SDdV3ikqW5JKio9SncrJO5++Uy/Oq+KYGg/fdOQh/oGuwyQVqFMXQ==",
       "requires": {
         "3vl": "0.2.3",
-        "big-integer": "1.6.44",
+        "big-integer": "1.6.45",
         "hashmap": "2.3.0",
         "minimist": "1.2.0",
         "sanitize-filename": "1.6.3",
@@ -8492,11 +8492,6 @@
         "topsort": "0.0.2"
       },
       "dependencies": {
-        "3vl": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/3vl/-/3vl-0.2.3.tgz",
-          "integrity": "sha512-MJZeMVt3PGlxtgioeMq/oi4sH08W9Oitj0ZAnrFY+tRwojk30NzMcqC+STtgN7uN8pKWzqtYWn2KUNF16QJbxg=="
-        },
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
diff --git a/package.json b/package.json
index 96f6174..54a0403 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "digitaljs_online",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Online demonstration for DigitalJS",
   "main": "src/server/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "bootstrap": "^4.3.1",
     "clipboard": "^2.0.4",
     "codemirror": "^5.48.2",
-    "digitaljs": "^0.5.1",
+    "digitaljs": "^0.5.2",
     "express": "^4.17.1",
     "file-saver": "^2.0.1",
     "jquery": "^3.4.1",
@@ -28,7 +28,7 @@
     "split-grid": "^1.0.9",
     "sql-template-strings": "^2.2.2",
     "sqlite": "^3.0.3",
-    "yosys2digitaljs": "^0.1.6"
+    "yosys2digitaljs": "^0.1.7"
   },
   "devDependencies": {
     "@babel/core": "^7.5.5",
diff --git a/public/index.html b/public/index.html
index 6539c78..fdd1279 100644
--- a/public/index.html
+++ b/public/index.html
@@ -73,18 +73,28 @@ <h1 class="text-primary">Yosys2digitaljs Demo</h1>
 </textarea>
 </div>
 <div class="form-group">
+<button type="submit" class="btn btn-primary">Synthesize and simulate!</button>
+</div>
+<div class="form-group">
 <label for="files">Additional SystemVerilog files:</label>
 <input type="file" class="form-control-file" id="files" multiple="true">
 </div>
+<div class="form-group form-check">
+<input type="checkbox" id="opt" class="form-check-input">
+<label for="opt" class="form-check-label">Optimize</label>
+</div>
 <div class="form-group">
-<button type="submit" class="btn btn-primary">Synthesize and simulate!</button>
-<input type="checkbox" id="opt"> <label for="opt">Optimize</label>
-<select id="fsm">
+<label for="fsm">FSM transform (experimental)</label>
+<select id="fsm" class="form-control">
 <option value="">No FSM transform</option>
 <option value="yes">FSM transform</option>
 <option value="nomap">FSM as circuit element</option>
 </select>
 </div>
+<div class="form-group form-check">
+<input type="checkbox" id="fsmexpand" class="form-check-input">
+<label for="fsmexpand" class="form-check-label">Merge more logic into FSM</label>
+</div>
 </form>
 </div>
 <div id="gutter_horiz" class="gutter gutter-horizontal"></div>
diff --git a/src/client/index.js b/src/client/index.js
index d1b58fd..8a76017 100644
--- a/src/client/index.js
+++ b/src/client/index.js
@@ -22,6 +22,7 @@ const examples = [
     ['cycleadder_arst.sv', 'Accumulating adder'],
     ['prio_encoder.sv', 'Priority encoder'],
     ['lfsr.sv', 'Linear-feedback shift register'],
+    ['fsm.sv', 'Finite state machine'],
     ['rom.sv', 'ROM'],
     ['ram.sv', 'RAM'],
 ];
@@ -168,7 +169,7 @@ function runquery() {
     for (const [filename, file] of Object.entries(filedata)) {
         data[filename] = file.result;
     }
-    const opts = { optimize: $('#opt').prop('checked'), fsm: $('#fsm').val() };
+    const opts = { optimize: $('#opt').prop('checked'), fsm: $('#fsm').val(), fsmexpand: $('#fsmexpand').prop('checked') };
     destroycircuit();
     $.ajax({
         type: 'POST',