Refactored 2 task