Removing z for now: too slow