massive restructuring of update your report block