v2.0.4. Improvement