Made timer setup better