production-settings improved