incorporated Erics edits