Updates to Token Generation

Updates to the token generation section.