Part1 corrections
update..