refactor, add Or operator