removed unnecessary ANDs