added more idiot-proofing