updated URLs and templates