Final rev for part1