MANTA-30 shift more tt logic into object