updated todo before refactor