modified tedsManager