Commit No. 52 - segmentation