Change to new variables format