Refactoring
Introducing Progress bar