more changes to fix new token stuff