Changed the way the token is set