v3.0.3. Improvement