Use new variable names