maybe fix part 2