edit for chap1, 2