Changed convert metod implementation