part 4 fixes