v2.5.2. Improvement