Changes: some refactoring...