converting to the main cxf version