switching a couple of ORs to ANDs