Refactored Criteria
Added displaying criteria values.