Finishing touches to exercise 7