v2.7.1. Improvement