Change location & Criteria

Change location & Criteria