Merge McLovinn work