Touched up interrupt handler