updated conditionals