more changes to token request