v.1.4.3: some refactoring