GenerateToken Update

Updated the GenerateToken, testing a few things.