Chapter 7 updates