copmlete 16 chapter and close #9 issue