some enhancement for chapter 2