conditionals updated