Updated report and code