updated parser and planner