Updated to reflect new settings