adding conditionals around selections