fixes part 1