add retry and verify