more mucking about with conditionals