exercise 6 + edits