Removed  task; added  task (fixes #2); modified task execution order to decouple  and