v9.70 with some refactoring and API changes