No more naive timing mechanism