part1 fixes