Updated to better reflect new settings.