fixed zap and or=