A lot of stuffs added to report