removed tbb and moved structure