GetNextToken edit 2