Made improvements to TC