Addressing Jon's comments on PR