Added a debugging switch.