changed "and" to "or" in bottom