modified dataserver