Modified for Chapter 7