Slight changes to tasks