Updated with chapter 6