Improved TBB
Code was completely re-structured