Update to segments, rail