Switch to interval check