Included edits from assigmments