merged tc updates and fixed error

merged tc updates and fixed error