Feral/ Windwalker Update to Interrupts