Few changes and progress bar