Fixed Edit and New Segment Routings