Improve report. May be this is final version