Updating changes from the weekend