improved idempotency