Fix part 1
fix part 2