[Chapters 5 + 7] edits