Removed the TCell type
Fixed conflicts