Timer and improvements