made modification to expression parser