Ch. 16, 17 and 18 edits