Updated the conversion