modif : binaryexpressionmodel + new : agg + and + or  + then