v2.6.0. Improvement