Removed hardcoded OR