Edits throughout