v2.7.0. Improvement