revamped IRQ work ... again :/