more conditionals

more conditionals