Refactored for plural paths