added token control