updated parser to account for addtional headers