Updated for different grammar layout