back to the original approach for DataFollower path exhaustion
after merge