diff --git a/build/toolchain.emscripten.mak b/build/toolchain.emscripten.mak
index 49e4ecabd..a3b7baba2 100644
--- a/build/toolchain.emscripten.mak
+++ b/build/toolchain.emscripten.mak
@@ -49,5 +49,7 @@ ifeq ($(DEBUG),1)
 EMFLAGS += --profiling-funcs -s ASSERTIONS=1
 endif
 
+EMFLAGS += -s MODULARIZE=1 -s 'EXPORT_NAME="Epsilon"'
+
 SFLAGS += $(EMFLAGS)
 LDFLAGS += $(EMFLAGS) -Oz -s EXPORTED_FUNCTIONS='["_main", "_IonEventsEmscriptenPushKey", "_IonEventsEmscriptenPushEvent"]'
diff --git a/ion/src/emscripten/simulator.html b/ion/src/emscripten/simulator.html
index 5b499a530..0f7cc6886 100644
--- a/ion/src/emscripten/simulator.html
+++ b/ion/src/emscripten/simulator.html
@@ -183,21 +183,14 @@
     <div>
       <a id="screenshot" href="#" target="_blank" download>Save screenshot</a>
     </div>
+    <script src="epsilon.js"></script>
     <script>
 var Module = {
-  arguments: ["fr"],
-  preRun: [],
-  postRun: [],
-  print: function(text) {
-    console.log(text);
-  },
-  printErr: function(text) {
-    console.error(text);
-  },
+  arguments: ["--language", "fr"],
   canvas: document.getElementById("screen")
 };
+Epsilon(Module);
     </script>
-    <script src="epsilon.js"></script>
     <script>
 var buttons = document.querySelectorAll(".calculator .keyboard a");
 for (var i=0; i< buttons.length; i++) {