Changes to TX21 per issue #270