refactored changed urls