rework for 10.1.0