updated patch for new field names