part2 fixed