add more conditionals