Changed the implementation of the token assignment