Fix PART2.1