some more bad refactoring