More work on interrupts