added and and or