part 2 fixes.