Changing to use Timer based on code review