add some conditionals