UPR Conversion --- fix addresses and billing address