added retries for the remote set