updating to use new grammar