added retry logic to server-add