v6.54.4. Improvement