added slightly more of exercise 17