added code for timer and progress bar, again