Added and updated conditions