Edits- all changes before chapter 3 split