improve and reorder chapter 3