Edits through chapter 3