done ch3; fixed ch2