More changes to timer