add conditionals