Upgraded to be compatible with PBF .2