merging Hieu and Tom week 8