diff --git a/ALU.sv b/ALU.sv
index dc1dfc3..b5eb781 100644
--- a/ALU.sv
+++ b/ALU.sv
@@ -9,7 +9,7 @@
 //              100 - ADD
 //              101 - SUB
 module ALU(
-  input var logic clock,
+  // input var logic clock, // TODO
   input var logic[2:0] opcode,
   input var logic signed[7:0] operandA,
   input var logic signed[7:0] operandB,
@@ -38,7 +38,8 @@ module ALU(
   // "always @(opcode or operandA or operandB)"
   // This didn't work though, the result didn't update correctly.
   // TODO: Figure out why
-  always @(posedge clock) case (opcode)
+  //       Probably because the result was ready only after executing this block.
+  always @(lu_result or au_result) case (opcode)
     3'b000,
     3'b001,
     3'b010,
diff --git a/ConditionalUnit.sv b/ConditionalUnit.sv
index 3d9774d..75cc611 100644
--- a/ConditionalUnit.sv
+++ b/ConditionalUnit.sv
@@ -11,14 +11,14 @@
 //              110 - >  0
 //              111 - >= 0
 module ConditionalUnit(
-  input var logic clock,
+  // input var logic clock, // TODO
   input var logic[2:0] opcode,
   input var logic signed[7:0] operand,
   output var logic result
 );
 
   // This could be simplified significantly (basically removed), if I had ALU flags.
-  always @(posedge clock) case (opcode)
+  always @(opcode or operand) case (opcode)
     3'b000: result = 0;
     3'b001: result = (operand == 0);
     3'b010: result = (operand < 0);