improving idempotency