More idiotproofing