Convert to be used with new TRDS 3.0