Remake of the state changes to make timers more efficient