code & report update