continued with refactoring with path