Interrupt handling changed