updated url refactoring