Fine tuning for v4.0