LIB30: new functionality / some refactoring