Code and report updates