Rewrite to use local server