Improved Criteria List

Changes made