Update part1-7