updated for Chapter 7