Made changes to timer stuff