Chapter 6 updates