Tweaked the tasks