Removed TED logic