Merge rory and chris.