both TBox optimizations refactoring completed