manually add _xwrap changes