Removed all the terrible Segment logic