Complete Chapter5 and add Chapter6