merged from DistanceRingsV2