reorganizing chapter 2 order of sections