edit conditionals

edit conditionals