added not and or