Added more changes at end of Chpater 5