Changes on Converter and MainActivity