correction of part 1 and 2