More changes
Edits