issue #27 Better Countdown Handling