Part2 fixed