Updated for production settings.