added progressBar, refactor