updated parser to work with new formatting