CHAPTER 6 - Small fix based on feedback