modified Converter.java