Updated chapter 4-5