fine tuned on reports , added more fields