adjustment to new dataserv function signature