Added or and and