Edits to Chap17 only