bif:or and bif:equals added