Commit changes from chapter 6