move server calls to local calls

 this needs to be fixed