expression parsing added