finished revision of chapter 18