Modified task runner