updated with chapter 3