Rolling in Paul's changes.

Changes rolled in for @PaulRobinson.