Chapter6 final commit