update chapter1 and chapter6