added changes to ch2 and ch3