Edits
Merged both