and use the right variable names