Corrections Switch + ThreadLocal