conditionals working right