Add debugging code, which needs removing!