added conditionals
added conditionals