[Chapters 3, 4, 6] edits