update ch01 and ch06