updated parser and modeals