urls refatored