Removed the logic related to moving in segments.