Update to ClosestRabbit