Modified chapter 4.2 & 5.2