Update chapter6 and chapter7