some refactoring, 30.06