merged Don and Johns enhancements to token enhancer to manage different token requests