Timer section fully rewritten