Changed the way the interrupt is *******