finish chp07
fix chp07