changed naming of variables