changed OR logic, not as DRY, but perhaps clearer