Pull values into UPC
UPC Tidy up