Updated conditional statements