debug code improved, but commented out