added dataServer
Revert "added dataServer"

This reverts commit 80fcf8b1d8dd0769916acb7e588febd7fa901528.
Revert "Revert "added dataServer""

This reverts commit f917f483101ea4743df2deb2b9ec94dfea61b040.