Added outer edge clipping