Rebased and changes in countdown timer logic