changes to Timer