Patch to new TTTrack class