switch to new variables @ format