Upgraded to be compatible with PBF version .2