modify to work with urls