Added AND and OR #2