Edits from Patrick