Updated to match suggested new default settings.