Changes to Segment and Trail