fixing conditionals
fixing conditionals