part2 almost done