Work done on report and on code