Complete exercise 8.1