edits throughout