conditions now also work with and, or conditions