Initial revision
One debug removed