fix part1
fix part 2