Report and Code updated