variable names updated