Yi - add more statements and criterias