added token polling