modified two files by adding eport function in it