updated conditional statements