incorporating edits