Tried to get only the relevant changes in from earlier branch, for saving report to a file #6