Add new variables, rearrange others