BFP - updated with 2nd beta in OP