additions and edits
more edits