added support for token re-use