modification again for url issues