Merge branch 'Longer-countdown'