Changed from homogeneous segments to non-homogeneous ones