add condition evaluation