Updated Conversion tool