working on ODM refactor