Canonical To UPC (updated)