Issue/#31

- Fixes #31 
- removed code related to progress