Made it more idiot-proof