diff --git a/app/src/editor/Board.ts b/app/src/editor/Board.ts
index d6ba36f..3963c36 100644
--- a/app/src/editor/Board.ts
+++ b/app/src/editor/Board.ts
@@ -375,12 +375,8 @@ export class Board {
       wire.markConnections();
     }
 
-    const inputs = this.components.filter(
-      (comp) => comp.kind.label === "input",
-    );
-    const outputs = this.components.filter(
-      (comp) => comp.kind.label === "output",
-    );
+    const inputs = this.inputsOrdered();
+    const outputs = this.outputsOrdered();
 
     const inputIdcs = new Map<Component, number>();
     for (const [i, input] of inputs.entries()) {
diff --git a/app/src/editor/ir.ts b/app/src/editor/ir.ts
index 859be55..6da6192 100644
--- a/app/src/editor/ir.ts
+++ b/app/src/editor/ir.ts
@@ -237,7 +237,7 @@ export class ComponentOptimizer {
       this.eliminateRedundantState();
       this.hoistInputs();
       this.moveSetStateToSource();
-      this.collapseStates();
+      // this.collapseStates();
       this.eliminateUnusedStates();
       this.eliminateRedundantSetState();
       if (removeUnusedStates) {
diff --git a/docs/event_state_chart.png b/docs/event_state_chart.png
new file mode 100644
index 0000000..f8262fd
Binary files /dev/null and b/docs/event_state_chart.png differ
diff --git a/docs/mouse_state_chart.png b/docs/mouse_state_chart.png
new file mode 100644
index 0000000..b1a3708
Binary files /dev/null and b/docs/mouse_state_chart.png differ
diff --git a/docs/presentation.odp b/docs/presentation.odp
new file mode 100644
index 0000000..7165f4e
Binary files /dev/null and b/docs/presentation.odp differ
diff --git a/docs/presentation.pdf b/docs/presentation.pdf
new file mode 100644
index 0000000..aff97eb
Binary files /dev/null and b/docs/presentation.pdf differ