Kevin's changes correctly merged with my changes (I think)