CHAPTER 13 - Code fixed based on reviews