move server calls to local calls