added zap and or=