grammar modified to reflect syntax tree better