v1.4.4. Improvement