Added both AND/OR