Added extre debugging features