Integrate feedback on chapter 6