Modify per pmeenan's comments