Update to TC 4.1

First attempt to make AT compatible with TC 4.1