Exercise 6 and edits