modified Convert.class