Add Some Tcs/ Removed a few