have to fix all the variable names