Chapters 12 and 18 updated