Major Grammar improvement