diff --git a/__pycache__/gradelib.cpython-35.pyc b/__pycache__/gradelib.cpython-35.pyc
index 8617e53..de7c7da 100644
Binary files a/__pycache__/gradelib.cpython-35.pyc and b/__pycache__/gradelib.cpython-35.pyc differ
diff --git a/kern/trap.c b/kern/trap.c
index 61692e2..bad3a8d 100644
--- a/kern/trap.c
+++ b/kern/trap.c
@@ -112,7 +112,7 @@ trap_init(void)
        SETGATE(idt[19], 0, GD_KT, trap_19, 0);
 
        // Clock interrupt
-       SETGATE(idt[32], 0, GD_KT, trap_32, 3);
+       SETGATE(idt[32], 0, GD_KT, trap_32, 0);
 
        SETGATE(idt[48], 0, GD_KT, trap_48, 3);
        // Per-CPU setup
@@ -285,6 +285,9 @@ trap(struct Trapframe *tf)
        // the interrupt path.
        assert(!(read_eflags() & FL_IF));
 
+       //cprintf("Incoming TRAP frame at %p\n", tf);
+       //cprintf("trapno: %d\n", tf->tf_trapno);
+
        if ((tf->tf_cs & 3) == 3) {
                // Trapped from user mode.
                // Acquire the big kernel lock before doing any
diff --git a/kern/trapentry.S b/kern/trapentry.S
index 11d1d65..5283a44 100644
--- a/kern/trapentry.S
+++ b/kern/trapentry.S
@@ -68,7 +68,7 @@ TRAPHANDLER_NOEC(trap_16, T_FPERR);
 TRAPHANDLER(trap_17, T_ALIGN);
 
 /* IRQ */
-TRAPHANDLER(trap_32, IRQ_OFFSET);
+TRAPHANDLER_NOEC(trap_32, IRQ_OFFSET + IRQ_TIMER);
 TRAPHANDLER_NOEC(trap_48, T_SYSCALL);
 /*
  * Lab 3: Your code here for _alltraps