try to remove wait in client by improving server