updated conditions