Added the dynamic TT version
Removed cruft