updated for url conflict