fixes part1