updates from part 2