Modified logic for check settings