after small refactoring