Building out the checking of T&T