updated parser and views