chapter 4 and 7 updates