Editing to Emily's changes