update to reflect change in or/and operators