Adjust api to server after review of server code