update paths; refactoring