changed the way tokens are created