More final touches to exercise 6