Updating suite to use a variable setting to avoid with