improvements (?) to timing