refactored, wrapped task Arr extracted
TODO updated