Finish merging Robert and Chris