some additions to report, and code to be tested
merge