Mofified version for token