made urls more generic