make work with new bpan