add more logging for tokenid