Updating with recent changes - part 2