merged
Updated irq handler to use new one