Updated for T3