Update part1 to make the data structure less ambiguous.