Modified task runner - part 2