Pat update

Pats pull request...