diff --git a/src/sys/isa/atkbd.c b/src/sys/isa/atkbd.c
index 3d1c77d..5ca1c81 100644
--- a/src/sys/isa/atkbd.c
+++ b/src/sys/isa/atkbd.c
@@ -171,17 +171,20 @@
 asm(
   ".globl keyboardISR     \n"
   "keyboardISR:           \n"
-  "  pusha                \n" /* Save all registers           */
-  "  call keyboardHandler \n"
-  "  popa                 \n"
+  //"  pusha                \n" /* Save all registers           */
+  //"  popa                 \n"
+  "  mov  $0x60,%dx       \n"
+  "  inb  %dx,%al         \n"
+  "  push %eax            \n"
   "  mov $0x20,%dx        \n" /* The Following Sends Our EOI To The MPIC  */
   "  mov $0x20,%ax        \n"    
   "  outb %al,%dx         \n"
+  "  call keyboardHandler \n"
+  "  pop  %eax            \n"
   "  iret                 \n" /* Exit interrupt               */
   );
 
-void keyboardHandler() {
-  unsigned int key = inportByte(0x60);
+void keyboardHandler(unsigned int key) {
 
   if (key > 255) 
     return;
@@ -248,14 +251,14 @@
   else {
     switch ((keyboardMap[key][keyMap] >> 8)) {
       case 0x30:
-        kprintf("Changing Consoles[0x%X:0x%X],Free Pages: [%i]\n",_current->id,_current,systemVitals->sysUptime);//schedFindTask(0x0),);
+        kprintf("Changing Consoles[0x%X:0x%X]\n",_current->id,_current);//schedFindTask(0x0),);
         /* changeConsole((keyboardMap[key][keyMap] & 0xFF)); */
         break;
       default:
         break;
       }
     }
-  //kprint("b");
+
   /* Return */
   return;
   }
@@ -285,6 +288,9 @@
 /***
 
  $Log$
+ Revision 1.9  2004/07/23 17:37:35  reddawg
+ Fix
+
  Revision 1.8  2004/07/23 09:10:06  reddawg
  ubixfs: cleaned up some functions played with the caching a bit
  vfs:    renamed a bunch of functions
diff --git a/src/sys/kernel/timer.S b/src/sys/kernel/timer.S
index f2bb4ed..3f5f92b 100644
--- a/src/sys/kernel/timer.S
+++ b/src/sys/kernel/timer.S
@@ -36,9 +36,7 @@
   incl 4(%ecx)             /* Increment sysTicks our 1000ms counter    */
   mov $0x20,%dx            /* The Following Sends Our EOI To The MPIC  */
   mov $0x20,%ax           
-  outb %al,%dx            
-  //mov $0xA0,%dx            /* The Following Sends Our EOI To The SPID  */
-  //outb %al,%dx            
+  outb %al,%dx                       
   movl 4(%ecx),%eax        /* Increment our sysUptime by 1S if 1000MS  */
   movl $1000,%ebx          /* Have Passed                              */
   xor %edx,%edx           
@@ -55,11 +53,14 @@
   jnz done                
   call sched              
 done:                     
-  popa                     /* Restore Registers                        */
+  popa                      /* Restore Registers                        */
   iret                    
 
 /***
  $Log$
+ Revision 1.3  2004/07/22 17:32:25  reddawg
+ I broke it hopefully
+
  Revision 1.2  2004/07/16 04:06:32  reddawg
  Tune ups this stuff should of been taken care of months ago