Update to timer class