Replaced "or" and "and" by || and &&