adding in conditionals