updated parser and player