Refactored follow-path