Added timer and progress indicator