fixed part2