Add some more ifs...