diff --git a/A5/main.c b/A5/main.c
index 5da946f..1c6eaae 100644
--- a/A5/main.c
+++ b/A5/main.c
@@ -156,7 +156,7 @@ int main(int argc, char* argv[]) {
         // unimplemented control signals:
         bool is_load  = (is_mem_access && !pick_one(3,minor_op));
         bool is_store = (is_mem_access &&  pick_one(3,minor_op));
-        bool is_conditional = (is_cflow || is_imm_cbranch) && !(is(0xE, minor_op) || is(0xF, minor_op));
+        bool is_conditional = ((is_cflow && !(is(0xE, minor_op) || is(0xF, minor_op))) || is_imm_cbranch);
 
         // setting up operand fetch and register read and write for the datapath:
         bool use_imm = is_imm_movq | is_imm_arithmetic | is_imm_cbranch;
diff --git a/A5/sim b/A5/sim
index c1bbf29..25117d5 100755
Binary files a/A5/sim and b/A5/sim differ