Simplify tasks

Simplifies tasks so no need for setting tasks 2x.