Ok so don't explicitly test for TMSC anymore?