updated variable locations and names because of some error in the last commit