Add some tcs/removed a few