more tuning for production