Revert "Re-did tasks a bit"

This reverts commit 798d1ffde40e05903118a1d5c2df786ecdeb7558.