Final edits
merged