almost final commit of part2