Improved spatial planner.