changing variable names, updating link