final update for Part1