Updates through chapter 6