Further consolidated timer logic