First part of the chapter 7 changes