bring in line with vendor_pa changes