after bad refactor