Made ingest more flexible