Updated GToken, working on Grammer