Changing to the right or || operator to solve issue 6