these are my new edits and changes