paths refactoring again