Improve the movement to target algorithm for range classes