finished revision of chapter 17