Added version one of better segmentation...