update to work with latest grammar