changes in chapter2 and chapter3