changed working with urls