some changes
Chapter 7 changes