updated URLs and variable names