More timer changes