updated to handle the new client / server data split.