adjustments after guvnor refactoring