Closest stops improved