more debug code commented out