1) modified output data function
Merged Changes