Moving to 100% BP instead of BP AND BP-substitues would make things a lot easier.