updated conditional