back to original - added debug code