Changed the way that the Task is updated. Fixes #1