Dataserver changed to fit redistribution