Merge in James's stuff