fixed prod settings
merged