Final Update for Part1