remove stop interrupts, use match instead