timer reworked entirely