changes till chapter 7 (including exercises)