finished revision of chapter 7