Some initial changes to timer code