Made changes in the Timer Class