CHANGED or statements in if() to and statements