&& changed to an ||