add || && replace with OR AND