UPR Converter - major rewrite to handle re-conversion