chapters 1 and 2 edits