First pull request update.  A box to T and T to A.