Timer commit

changes to timer