Merge Robert and Chris work