little leftover from the previous refactor