Changed a few tasks