Complete exercise 16