re #9575 completed 6 and 7