Use the new vars