Changes for chapter 3 and 4