removed junk
removed junk
use '||' to indicate matching preferences