Bit more debugging and hacking...