part of previous refactor