AND, OR added