More yoffset removal