Performance improvement - we can keep squeezing the interval
Cleaner still