Working version for report 3 full