refactored urls