pre final commit in chap5