CarrierText: make it more future-proof