add yyets logic