finished refactoring otl management