Add more clipping