Third report and some improvements - refs BT#7998