- added new tasks
- a little bit of refactoring