diff --git a/static/js/languages/microscript/v2/runner.coffee b/static/js/languages/microscript/v2/runner.coffee
index bb1081b..7d5fc5b 100644
--- a/static/js/languages/microscript/v2/runner.coffee
+++ b/static/js/languages/microscript/v2/runner.coffee
@@ -144,6 +144,10 @@ class @Runner
     processor.run(@microvm.context)
 
   tick:()->
+    # Reset input states at the beginning of every frame
+    if @updateControls?
+      @updateControls()
+
     if @system.fps?
       @fps = @fps*.9 + @system.fps*.1
 
@@ -277,8 +281,6 @@ class @Thread
         program = parser.program
         compiler = new Compiler(program)
         @processor.load compiler.routine
-        if (f == "update()" or f == "serverUpdate()") and @runner.updateControls?
-          @runner.updateControls()
       true
     else
       false
diff --git a/static/js/languages/microscript/v2/runner.js b/static/js/languages/microscript/v2/runner.js
deleted file mode 100644
index a4cde56..0000000
--- a/static/js/languages/microscript/v2/runner.js
+++ /dev/null
@@ -1,385 +0,0 @@
-this.Runner = class Runner {
-  constructor(microvm) {
-    this.microvm = microvm;
-  }
-
-  init() {
-    this.initialized = true;
-    this.system = this.microvm.context.global.system;
-    this.system.preemptive = 1;
-    this.system.threads = [];
-    this.main_thread = new Thread(this);
-    this.threads = [this.main_thread];
-    this.current_thread = this.main_thread;
-    this.thread_index = 0;
-    this.microvm.context.global.print = this.microvm.context.meta.print;
-    this.microvm.context.global.random = new Random(0);
-    this.microvm.context.global.Function = {
-      bind: function(obj) {
-        var rc;
-        if (this instanceof Routine) {
-          rc = this.clone();
-          rc.object = obj;
-          return rc;
-        } else {
-          return this;
-        }
-      }
-    };
-    this.microvm.context.global.List = {
-      sortList: (f) => {
-        var funk;
-        if ((f != null) && f instanceof Program.Function) {
-          funk = function(a, b) {
-            return f.call(this.microvm.context.global, [a, b], true);
-          };
-        } else if ((f != null) && typeof f === "function") {
-          funk = f;
-        }
-        return this.sort(funk);
-      },
-      "+": function(a, b, self) {
-        if (!self) { // not +=, clone array a
-          a = [...a];
-        }
-        if (Array.isArray(b)) {
-          return a.concat(b);
-        } else {
-          a.push(b);
-          return a;
-        }
-      },
-      "-": function(a, b, self) {
-        var index;
-        if (!self) { // not -=, clone array a
-          a = [...a];
-        }
-        index = a.indexOf(b);
-        if (index >= 0) {
-          a.splice(index, 1);
-        }
-        return a;
-      }
-    };
-    this.microvm.context.global.Object = {};
-    this.microvm.context.global.String = {
-      fromCharCode: function(...args) { return String.fromCharCode(...args) },
-      "+": function(a, b) {
-        return a + b;
-      }
-    };
-    this.microvm.context.global.Number = {
-      parse: function(s) {
-        var res;
-        res = Number.parseFloat(s);
-        if (isFinite(res)) {
-          return res;
-        } else {
-          return 0;
-        }
-      },
-      toString: function() {
-        return this.toString();
-      }
-    };
-    this.fps = 60;
-    this.fps_max = 60;
-    this.cpu_load = 0;
-    this.microvm.context.meta.print("microScript 2.0");
-    return this.triggers_controls_update = true;
-  }
-
-  run(src, filename, callback) {
-    var compiler, err, id, j, len, parser, program, ref, result, w;
-    if (!this.initialized) {
-      this.init();
-    }
-    parser = new Parser(src, filename);
-    parser.parse();
-    if (parser.error_info != null) {
-      err = parser.error_info;
-      err.type = "compile";
-      throw err;
-    }
-    if (parser.warnings.length > 0) {
-      ref = parser.warnings;
-      for (j = 0, len = ref.length; j < len; j++) {
-        w = ref[j];
-        id = filename + "-" + w.line + "-" + w.column;
-        switch (w.type) {
-          case "assigning_api_variable":
-            if (this.microvm.context.warnings.assigning_api_variable[id] == null) {
-              this.microvm.context.warnings.assigning_api_variable[id] = {
-                file: filename,
-                line: w.line,
-                column: w.column,
-                expression: w.identifier
-              };
-            }
-            break;
-          case "assignment_as_condition":
-            if (this.microvm.context.warnings.assignment_as_condition[id] == null) {
-              this.microvm.context.warnings.assignment_as_condition[id] = {
-                file: filename,
-                line: w.line,
-                column: w.column
-              };
-            }
-        }
-      }
-    }
-    program = parser.program;
-    compiler = new Compiler(program);
-    result = null;
-    compiler.routine.callback = function(res) {
-      if (callback != null) {
-        return callback(Program.toString(res));
-      } else {
-        return result = res;
-      }
-    };
-    this.main_thread.addCall(compiler.routine);
-    this.tick();
-    return result;
-  }
-
-  call(name, args) {
-    var f, routine;
-    if (name === "draw" || name === "update" || name === "serverUpdate") {
-      if (this.microvm.context.global[name] != null) {
-        this.main_thread.addCall(`${name}()`);
-      }
-      return;
-    }
-    if (this.microvm.context.global[name] != null) {
-      if ((args == null) || !args.length) {
-        return this.main_thread.addCall(`${name}()`);
-      } else {
-        routine = this.microvm.context.global[name];
-        if (routine instanceof Routine) {
-          f = this.main_thread.processor.routineAsFunction(routine, this.microvm.context);
-          return f(...args);
-        } else if (typeof routine === "function") {
-          return routine(...args);
-        }
-      }
-    } else {
-      return 0;
-    }
-  }
-
-  toString(obj) {
-    return Program.toString(obj);
-  }
-
-  process(thread, time_limit) {
-    var processor;
-    processor = thread.processor;
-    processor.time_limit = time_limit;
-    this.current_thread = thread;
-    return processor.run(this.microvm.context);
-  }
-
-  tick() {
-    var dt, frame_time, i, index, j, k, len, load, margin, processing, processor, ref, ref1, t, time, time_limit, time_out;
-    if (this.system.fps != null) {
-      this.fps = this.fps * .9 + this.system.fps * .1;
-    }
-    this.fps_max = Math.max(this.fps, this.fps_max);
-    frame_time = Math.min(16, Math.floor(1000 / this.fps_max));
-    if (this.fps < 59) {
-      margin = 10;
-    } else {
-      margin = Math.floor(1000 / this.fps * .8);
-    }
-    time = Date.now();
-    time_limit = time + 100; // allow more time to prevent interrupting main_thread in the middle of a draw()
-    time_out = this.system.preemptive ? time_limit : 2e308;
-    processor = this.main_thread.processor;
-    if (!processor.done) {
-      if (this.main_thread.sleep_until != null) {
-        if (Date.now() >= this.main_thread.sleep_until) {
-          delete this.main_thread.sleep_until;
-          this.process(this.main_thread, time_out);
-        }
-      } else {
-        this.process(this.main_thread, time_out);
-      }
-    }
-    while (processor.done && Date.now() < time_out && this.main_thread.loadNext()) {
-      this.process(this.main_thread, time_out);
-    }
-    time_limit = time + margin; // secondary threads get remaining time
-    time_out = this.system.preemptive ? time_limit : 2e308;
-    processing = true;
-    while (processing) {
-      processing = false;
-      ref = this.threads;
-      for (j = 0, len = ref.length; j < len; j++) {
-        t = ref[j];
-        if (t !== this.main_thread) {
-          if (t.paused || t.terminated) {
-            continue;
-          }
-          processor = t.processor;
-          if (!processor.done) {
-            if (t.sleep_until != null) {
-              if (Date.now() >= t.sleep_until) {
-                delete t.sleep_until;
-                this.process(t, time_out);
-                processing = true;
-              }
-            } else {
-              this.process(t, time_out);
-              processing = true;
-            }
-          } else if (t.start_time != null) {
-            if (t.repeat) {
-              while (time >= t.start_time && !(t.paused || t.terminated)) {
-                if (time >= t.start_time + 150) {
-                  t.start_time = time + t.delay;
-                } else {
-                  t.start_time += t.delay;
-                }
-                processor.load(t.routine);
-                this.process(t, time_out);
-                processing = true;
-              }
-            } else {
-              if (time >= t.start_time) {
-                delete t.start_time;
-                processor.load(t.routine);
-                this.process(t, time_out);
-                processing = true;
-              }
-            }
-          } else {
-            t.terminated = true;
-          }
-        }
-      }
-      if (Date.now() > time_limit) {
-        break;
-      }
-    }
-    for (i = k = ref1 = this.threads.length - 1; k >= 1; i = k += -1) {
-      t = this.threads[i];
-      if (t.terminated) {
-        this.threads.splice(i, 1);
-        index = this.system.threads.indexOf(t.interface);
-        if (index >= 0) {
-          this.system.threads.splice(index, 1);
-        }
-      }
-    }
-    t = Date.now() - time;
-    dt = time_limit - time;
-    load = t / dt * 100;
-    this.cpu_load = this.cpu_load * .9 + load * .1;
-    this.system.cpu_load = Math.min(100, Math.round(this.cpu_load));
-  }
-
-  createThread(routine, delay, repeat) {
-    var i, j, ref, t;
-    t = new Thread(this);
-    t.routine = routine;
-    this.threads.push(t);
-    t.start_time = Date.now() + delay - 1000 / this.fps;
-    if (repeat) {
-      t.repeat = repeat;
-      t.delay = delay;
-    }
-    this.system.threads.push(t.interface);
-    for (i = j = 0, ref = routine.import_values.length - 1; j <= ref; i = j += 1) {
-      if (routine.import_values[i] === routine) {
-        routine.import_values[i] = t.interface;
-      }
-    }
-    return t.interface;
-  }
-
-  sleep(value) {
-    if (this.current_thread != null) {
-      return this.current_thread.sleep_until = Date.now() + Math.max(0, value);
-    }
-  }
-
-};
-
-this.Thread = class Thread {
-  constructor(runner) {
-    this.runner = runner;
-    this.loop = false;
-    this.processor = new Processor(this.runner);
-    this.paused = false;
-    this.terminated = false;
-    this.next_calls = [];
-    this.interface = {
-      pause: () => {
-        return this.pause();
-      },
-      resume: () => {
-        return this.resume();
-      },
-      stop: () => {
-        return this.stop();
-      },
-      status: "running"
-    };
-  }
-
-  addCall(call) {
-    if (this.next_calls.indexOf(call) < 0) {
-      return this.next_calls.push(call);
-    }
-  }
-
-  loadNext() {
-    var compiler, f, parser, program;
-    if (this.next_calls.length > 0) {
-      f = this.next_calls.splice(0, 1)[0];
-      if (f instanceof Routine) {
-        this.processor.load(f);
-      } else {
-        parser = new Parser(f, "");
-        parser.parse();
-        program = parser.program;
-        compiler = new Compiler(program);
-        this.processor.load(compiler.routine);
-        if ((f === "update()" || f === "serverUpdate()") && (this.runner.updateControls != null)) {
-          this.runner.updateControls();
-        }
-      }
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  pause() {
-    if (this.interface.status === "running") {
-      this.interface.status = "paused";
-      this.paused = true;
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  resume() {
-    if (this.interface.status === "paused") {
-      this.interface.status = "running";
-      this.paused = false;
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  stop() {
-    this.interface.status = "stopped";
-    this.terminated = true;
-    return 1;
-  }
-
-};