Progress Bar added
Fixed conflicts with progress bar