update to exercise 17