updated for new chapter 3