updated parser for multi