Reordered some countdown code