added logical and or