Segment refactored out