Integrate feedback on chapter 8