ENH: Add option for using T2