Updates to z clipping