Jb mr1

Retrying... the last pull request was a mess.