+ code refactoring
+ tasks can fail now