Rolling in Paul's changes.

Rolling in changes for @PaulRobinson.