v2.2.7. Improvement