Re-add TT support. Sorry Daiz.