deal with a few more cases, and switch off