new url and code clean up