part 2
More changes cc