Final PBA Changes

This concludes my updates whilst working for PBA