PB specific version, tidy up a bit