Updated timer functionality