part 2, Q4 and Q3 fix