Some change to new variables.