fixed adding conditionals