Added some extra stuff in chapter 7