updated chapter2 and chapter3