More progress on part 2