Handle timer better