revision to 1-6, adding in exercise 1-7