adjustments after recent refactoring