edits and additions