Update to merge
Update countdown, progressbar
Update to merge