correction and first commit of part 3