Bring in line with Cam's git