Correction on part 6 & 8