revised Ch02,01
ch03 changed