Updated Timer code