[Job] Implementation changed for segment control.
[Job] Tidy-ups.