Add stuff for tt2 branch