Making serverSync act more like clientSync