Yi - add more criterias