put back "T" solver optimization