Improvements, added a progress bar.